Merge branch 'branching'

branching/branching.tex

@@ -549,9 +549,10 @@ Hit return to start merge resolution tool (meld):
 
     Zuotian Tatum
 
-    % https://www.atlassian.com/git
-
   \end{center}
+  \vfill
+  \permfoot{http://git-scm.com/book}\\
+  \permfoot{https://www.atlassian.com/git}
 \end{frame}
 
 \end{document}

branching/branching_handouts.tex

+\documentclass{article}
+\usepackage{fullpage}
+
+\frenchspacing
+\setlength{\parindent}{0pt}
+\pagestyle{empty}
+
+\begin{document}
+\begin{center}
+{\bf Git Introduction Course}
+
+Working with branches in Git practical.
+\end{center}
+\bigskip
+
+\subsubsection*{Inspect the commit graph.}
+We'll work from the repository you created in the previous practical.
+
+\begin{itemize}
+  \item \emph{Question:} What is you current branch and what is the hash of
+    the commit it points to?
+  \item \emph{Question:} What does the commit graph of you repository look
+    like?
+\end{itemize}
+\emph{Hint:} Use \texttt{git log} with the appropriate arguments.
+
+\bigskip
+
+\subsubsection*{Implement a feature in a new branch.}
+Let's do some real work (e.g., add some documentation to the project).
+
+\bigskip
+
+Start by creating a branch for your work (give it a descriptive name) and
+switch to it.
+
+\begin{itemize}
+  \item \emph{Question:} What branches are there now and what are the commits
+    they point to?
+\end{itemize}
+
+\bigskip
+
+Implement your feature (e.g. write documentation) and commit your changes.
+
+\begin{itemize}
+  \item \emph{Question:} What does the commit graph of you repository look
+    like now?
+\end{itemize}
+
+\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}