From af7b7979e9fe0f714f9fa712a0649b3a088d59eb Mon Sep 17 00:00:00 2001
From: Martijn Vermaat <martijn@vermaat.name>
Date: Mon, 14 Oct 2013 11:19:04 +0200
Subject: [PATCH] Finish branching handouts
---
branching/branching_handouts.tex | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/branching/branching_handouts.tex b/branching/branching_handouts.tex
index b4c5a9f..43aeb88 100644
--- a/branching/branching_handouts.tex
+++ b/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}
--
GitLab