Skip to content
Snippets Groups Projects
Commit 810eca39 authored by Anders Nilsson's avatar Anders Nilsson
Browse files

Updated handson

parent ebe39742
No related branches found
No related tags found
No related merge requests found
Pipeline #657 failed
No preview for this file type
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
\usepackage{tikz} \usepackage{tikz}
\usepackage{listings} \usepackage{listings}
\title{Git Hands-On\\ \tiny{Version: 0.4}} \title{Git Hands-On\\ \tiny{Version: 0.5}}
\author{Anders Nilsson \\ \author{Anders Nilsson \\
\texttt{andersn@control.lth.se}} \texttt{andersn@control.lth.se}}
...@@ -95,7 +95,7 @@ git config --global user.email "andersn@control.lth.se" ...@@ -95,7 +95,7 @@ git config --global user.email "andersn@control.lth.se"
\end{lstlisting} \end{lstlisting}
Then let's clone the playground repository: Then let's clone the playground repository:
\begin{lstlisting} \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 cd playground
\end{lstlisting} \end{lstlisting}
...@@ -146,7 +146,7 @@ Delta compression using up to 8 threads. ...@@ -146,7 +146,7 @@ Delta compression using up to 8 threads.
Compressing objects: 100\% (2/2), done. Compressing objects: 100\% (2/2), done.
Writing objects: 100\% (3/3), 306 bytes | 0 bytes/s, done. Writing objects: 100\% (3/3), 306 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0) 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 8a8ad08..eb02c3c master -> master
\end{lstlisting} \end{lstlisting}
...@@ -156,9 +156,9 @@ If the previous push command went as shown, you happened to be the ...@@ -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 first in the group to perform a push. Instead you might see something similar to
\begin{lstlisting} \begin{lstlisting}
andersn@fiol:../andersn/work/playground\$ git push 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) ! [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: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing 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 hint: to the same ref. You may want to first integrate the remote changes
...@@ -176,7 +176,7 @@ remote: Counting objects: 5, done. ...@@ -176,7 +176,7 @@ remote: Counting objects: 5, done.
remote: Compressing objects: 100\% (2/2), done. remote: Compressing objects: 100\% (2/2), done.
remote: Total 3 (delta 1), reused 0 (delta 0) remote: Total 3 (delta 1), reused 0 (delta 0)
Unpacking objects: 100\% (3/3), done. 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 eb02c3c..0bf182c master -> origin/master
Auto-merging Readme Auto-merging Readme
CONFLICT (content): Merge conflict in Readme CONFLICT (content): Merge conflict in Readme
...@@ -214,5 +214,7 @@ Keep on playing with the playground repository to get familiarized with git. ...@@ -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}, \item Point a web browser to \texttt{http://gitlab.control.lth.se},
find the playground project and play around with the functionality find the playground project and play around with the functionality
in gitlab. 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{itemize}
\end{document} \end{document}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment