Merge branch 'master' of git.lumc.nl:j.f.j.laros/gitcourse

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}

remotes/remotes.tex

@@ -297,8 +297,6 @@ $ git pull    ==>    $ git fetch origin
   \end{itemize}
 \end{frame}
 
-% todo: create gitlab project, clone gitlab project
-
 \section{Questions?}
 \lastpagetemplate
 \begin{frame}
@@ -311,9 +309,10 @@ $ git pull    ==>    $ git fetch origin
 
     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}

remotes/remotes_handouts.tex

+\documentclass{article}
+\usepackage{fullpage}
+
+\frenchspacing
+\setlength{\parindent}{0pt}
+\pagestyle{empty}
+
+\begin{document}
+\begin{center}
+{\bf Git Introduction Course}
+
+Git and remote repositories practical.
+\end{center}
+\bigskip
+
+\subsubsection*{Add your repository to GitLab.}
+Now you have a nice repository, of course you want to share it on GitLab.
+
+\bigskip
+
+Go to GitLab and create a new project.
+
+\begin{itemize}
+  \item \emph{Question:} What is the repository URL for your new project?
+\end{itemize}
+
+\bigskip
+
+Add a remote for your GitLab repository.
+
+\bigskip
+
+Push your branch(es) to GitLab.
+
+\begin{itemize}
+  \item \emph{Question:} Can you see your repository content in the GitLab web
+    interface?
+\end{itemize}
+
+
+\subsubsection*{Clone an existing repository from GitLab.}
+There already are some nice repositories on GitLab! Pick one (e.g., from the
+person sitting next to you, or browse the public repositories using the globe
+icon in the top right).
+
+\bigskip
+
+Create a local clone of the repository you picked.
+
+\begin{itemize}
+  \item \emph{Question:} In the resulting repository, what remotes and
+    branches exist?
+\end{itemize}
+
+
+\subsubsection*{For experts: create a merge request.}
+If you are interested, here are some additional GitLab features you can
+use. Fork an existing project, implement a feature, and submit a merge
+request.
+
+\bigskip
+
+Find an interesting project and click the \emph{Fork} button. This makes a
+copy of the project under your own user, on GitLab.
+
+\bigskip
+
+Clone the project (your fork) to your local machine.
+
+\bigskip
+
+Create a new branch and implement some feature in it. Make sure to commit
+this.
+
+\bigskip
+
+Push your new branch to GitLab (your fork of the project).
+
+\bigskip
+
+If you now go to your GitLab dashboard (homepage), you'll see a green button
+to create a merge request. From the merge request, the owner of the original
+project can directly merge your changes using only the web interface.
+
+\bigskip
+
+\emph{Hint:} You can also start a discussion or do some code review inside the
+merge request.
+
+\end{document}