diff --git a/handson.pdf b/handson.pdf index 938f2fba51d0a30e54f88c7a94389aff53ce6ff8..44e3a59a3f7cbaeec5c22f2d239e2ca71e60438c 100644 Binary files a/handson.pdf and b/handson.pdf differ diff --git a/handson.tex b/handson.tex index cd43e67d6b7c35ce6ee7e79ed10e70aca6f656e0..e566920626034c7ddf8b2ca5f9e97154c3f9eca1 100644 --- a/handson.tex +++ b/handson.tex @@ -4,7 +4,7 @@ \usepackage{tikz} \usepackage{listings} -\title{Git Hands-On\\ \tiny{Version: 0.4}} +\title{Git Hands-On\\ \tiny{Version: 0.5}} \author{Anders Nilsson \\ \texttt{andersn@control.lth.se}} @@ -95,7 +95,7 @@ git config --global user.email "andersn@control.lth.se" \end{lstlisting} Then let's clone the playground repository: \begin{lstlisting} -git clone ssh://git@gitlab.control.lth.se:/FRT090-2016/playground.git +git clone ssh://git@gitlab.control.lth.se:/regler/FRTN40/2018/playground.git cd playground \end{lstlisting} @@ -146,7 +146,7 @@ Delta compression using up to 8 threads. Compressing objects: 100\% (2/2), done. Writing objects: 100\% (3/3), 306 bytes | 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0) -To ssh://git@gitlab.control.lth.se:/FRT090-2015/playground.git +To ssh://git@gitlab.control.lth.se:/regler/FRTN40/2018/playground.git 8a8ad08..eb02c3c master -> master \end{lstlisting} @@ -156,9 +156,9 @@ If the previous push command went as shown, you happened to be the first in the group to perform a push. Instead you might see something similar to \begin{lstlisting} andersn@fiol:../andersn/work/playground\$ git push -To git@gitlab.control.lth.se:frt090-2016/playground.git +To git@gitlab.control.lth.se:/regler/FRTN40/2018/playground.git ! [rejected] master -> master (fetch first) -error: failed to push some refs to 'git@gitlab.control.lth.se:frt090-2016/playground.git' +error: failed to push some refs to 'git@gitlab.control.lth.se:/regler/FRTN40/2018/playground.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes @@ -176,7 +176,7 @@ remote: Counting objects: 5, done. remote: Compressing objects: 100\% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0) Unpacking objects: 100\% (3/3), done. -From gitlab.control.lth.se:frt090-2016/playground +From gitlab.control.lth.se:regler/FRTN40/2018/playground eb02c3c..0bf182c master -> origin/master Auto-merging Readme CONFLICT (content): Merge conflict in Readme @@ -214,5 +214,7 @@ Keep on playing with the playground repository to get familiarized with git. \item Point a web browser to \texttt{http://gitlab.control.lth.se}, find the playground project and play around with the functionality in gitlab. +\item On \texttt{gitlab.control.lth.se}, go to \emph{Issues} and ply + around. Create new issues, modify and/or close existing ones. \end{itemize} \end{document} \ No newline at end of file