Commit af7b7979 authored by Vermaat's avatar Vermaat
Browse files

Finish branching handouts

parent 025f8d0c
......@@ -50,4 +50,27 @@ Implement your feature (e.g. write documentation) and commit your changes.
\subsubsection*{Merge your feature.}
Of course we want this nice feature in our \texttt{master} branch.
\item \emph{Question:} If you want to merge branch \texttt{B} into branch
\texttt{A}, what should be your current branch?
Merge your feature branch into \texttt{master}.
\item \emph{Question:} What does the commit graph of you repository look
like now?
Since you merged it, you can now delete the feature branch.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment