Finish branching handouts

branching/branching_handouts.tex

@@ -50,4 +50,27 @@ Implement your feature (e.g. write documentation) and commit your changes.
 
 \bigskip
 
+\subsubsection*{Merge your feature.}
+Of course we want this nice feature in our \texttt{master} branch.
+
+\bigskip
+
+\begin{itemize}
+  \item \emph{Question:} If you want to merge branch \texttt{B} into branch
+    \texttt{A}, what should be your current branch?
+\end{itemize}
+
+\bigskip
+
+Merge your feature branch into \texttt{master}.
+
+\begin{itemize}
+  \item \emph{Question:} What does the commit graph of you repository look
+    like now?
+\end{itemize}
+
+\bigskip
+
+Since you merged it, you can now delete the feature branch.
+
 \end{document}