+ \begin{block}{Merge develop to master}
+ \begin{lstlisting}
+frobnicator@frobmachine:~/projects/myfirstproject$\$$ git merge develop
+ \end{lstlisting}
+ \end{block}
+
+ \begin{block}{How to get a conflict}
+ \begin{itemize}
+ \item We make a file with three lines
+ \item On every line we set: \texttt{regelN} where N is line
+ number.
+ \item Change line 2 in the master and develop branch to a
+ separate thing.
+ \item Commit both and checkout master
+ \item Do merge
+ \end{itemize}
+ \end{block}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Merge 2}
+ \begin{block}{Merge message}
+ \begin{lstlisting}
+frobnicator@frobmachine~/projects/myfirstproject$\$$ git merge develop
+Auto-merging mergeconfict
+CONFLICT (content): Merge conflict in mergeconfict
+Automatic merge failed; fix conflicts and then commit the result.
+ \end{lstlisting}
+ \end{block}
+ \begin{block}{Contents of mergeconflict file}
+ \begin{lstlisting}
+1 regel1
+2 <<<<<<< HEAD
+3 masterregel2
+4 =======
+5 developregel2
+6 >>>>>>> develop
+7 regel3
+ \end{lstlisting}
+ \end{block}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Merge 3}
+ \begin{block}{Commit message}
+ \begin{lstlisting}
+ 1 Merge branch 'develop'
+ 2
+ 3 Conflicts:
+ 4 mergeconfict
+ 5 #
+ 6 # It looks like you may be committing a merge.
+ 7 # If this is not correct, please remove the file
+ 8 # .git/MERGE_HEAD
+ 9 # and try again.
+10
+11
+12 # Please enter the commit message for your changes. Lines starting
+13 # with '#' will be ignored, and an empty message aborts the commit.
+14 # On branch master
+15 # All conflicts fixed but you are still merging.
+16 #
+17 # Changes to be committed:
+18 # modified: mergeconfict
+19 #
+ \end{lstlisting}
+ \end{block}
+\end{frame}
+
+\begin{frame}[fragile]
+ \frametitle{Merge 4}
+ \begin{block}{Output from git log}
+ \begin{lstlisting}
+* a6474c9 (HEAD, master) Merge branch 'develop'
+|\
+| * 8b292ad (develop) Develop merge conflict
+* | 7d5018a Master merge confict
+|/
+* 885a341 First merge conflict push
+* cd094bc This is a second commit
+* c9c9b35 Adds frobbedfile
+ \end{lstlisting}
+ \end{block}