Commit b03acc1c authored by simokron's avatar simokron
Browse files

Initial version of the pre-break stuff.

parent 3b0acafb
......@@ -34,3 +34,9 @@ Tutorial.bbl
Tutorial.blg
Tutorial.log
*.fdb_latexmk
Tutorial.fls
Tutorial.out
......@@ -9,6 +9,7 @@
\newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
\usepackage{bm}
\usepackage[caption=false]{subfig}
\usepackage{hyperref}
\usepackage{booktabs}
\usepackage{amsfonts}
......@@ -43,7 +44,7 @@
\hfill
\begin{minipage}{0.95\textwidth}
\vskip 2em
\let\footnote\thanks
\let\footnote\thanks
{\large \@title \par }
\vskip 1.5em
{\large \@author \par}
......@@ -68,31 +69,88 @@
{\normalfont\scshape}{\thesubsection}{1em}{}
\titleformat{\subsubsection}
{\normalfont\scshape\itshape \centering}{\thesubsubsection}{1em}{}
\pagestyle{empty}
\begin{document}
Tutorial part 1:
To start with:
\hbadness=10000
\begin{itemize}
\item Refresher colloquium + GitKraken installation
\item Find a partner
\item Log in on GitLab (wt)
\item Connect GitKraken to GitLab (wt)
\item Make project with GitKraken (wt)
\item Add text file to folder (wt)
\item Stage file (wt)
\item Commit file with commit message (wt)
\item Check if file is on GitLab (wt)
\item Git push (wt)
\item Check again (wt)
\item Create second file, do a couple of commits, use stage to do multiple commits
\item Refresher colloquium + GitKraken installation.
\item Tell everyone to find a partner.
\end{itemize}
Walkthrough 1:
\hbadness=10000
\begin{itemize}
\item Log in on GitLab \url{https://gitlab.tue.nl/}.\\
\includegraphics[width=\linewidth]{Figs/tutorialPart1/loginGitLab.png}
\item Connect GitKraken to GitLab.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/connectGitKraken1.png}\\
Simply enter the host domain and click ''generate a token on GitLab.\\
\includegraphics[width=\linewidth]{Figs/tutorialPart1/connectGitKraken3.png}\\
Enter a suitable name, and make sure that \texttt{api} and \texttt{read\_user} are selected then press ''Generate personal access token''.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/connectGitKraken2.png}\\
Enter a suitable name for the SSH key and press ''Generate SSH key and add to GitLab.\clearpage
\item \textit{Initialise} a new project on GitLab \url{https://gitlab.tue.nl/}.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/makeProjectGitLab1.png}\\
Click on ''New project''.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/makeProjectGitLab2.png}\\
Make sure that ''Blank project'' is highlighted, then enter a suitable name and make sure to select ''Initialize repository with a README''.\clearpage
\item \textit{Clone} the project using GitKraken.\\[3pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/cloneRepo1.png}\\
Select ''New Tab'' or the ''$+$'' button, then click ''Clone a repo''.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/cloneRepo2.png}\\
Select ''Clone'' then ''GitLab (Self-Managed) and select a location on your computer, then pick the correct repository and press ''Clone the repo!''\clearpage
\item Add a text file to the \textit{root folder} of the repository.\\
Platform specific - anything will do and you can create a new one with some text in it.
\item \textit{Stage} the new file.\\
\includegraphics[scale=1]{Figs/tutorialPart1/stageFile.png}\\
Click on the file or ''stage all changes''.
\item Check if the file is on GitLab.\\
Go to \url{https://gitlab.tue.nl/} and click on the project.\\
The file is not there.
\item \textit{Commit} the file with a commit message.\\
Go back to GitKraken.\\[5pt]
\includegraphics[scale=1]{Figs/tutorialPart1/commitFile.png}\\
Enter a fitting summary (and optional description), then press ''Commit changes to 1 file''.
\item Check if file is on GitLab.\\
Go to \url{https://gitlab.tue.nl/} and click on the project.\\
The file is not there.
\item \textit{Push} the staged commits to the \textit{remote repository}.\\
Go back to GitKraken.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/pushCommit.png}\\
Note that the new commit has a laptop icon next to it - indicating that it is a \textit{local commit} thus far.\\[3pt]
Click the upwards facing arrow which says ''Push'', and note that the GitLab icon is now next to the laptop - this indicates parity between the \textit{remote} and \textit{local repositories}.
\item Check GitLab once again (wt)\\
Go to \url{https://gitlab.tue.nl/} and click on the project.\\
This time the text file is indeed available.
\end{itemize}
This ends the first walkthrough.
Before the break, you should all try to
\begin{itemize}
\item Create a new text file.
\item Perform a couple of commits.
\item Use stage for multiple files and several changes.
\item Push a few times to the remote repository.
\end{itemize}
For those who want a challenge, try to
\begin{itemize}
\item \textit{Unstage} a staged commit, change some things then re-stage the new changes and commit.
\item \textit{Checkout} an old commit.
\item \textit{Reset} the repository to an older commit.
\end{itemize}
BREAK \\
\vfill
\textbf{BREAK}
\clearpage
Tutorial part 2:
\hbadness=10000
\begin{itemize}
\item Branches
\item Create branch and commit
......@@ -101,7 +159,9 @@ Tutorial part 2:
\item Create merge conflict (switch branch and commit on same line)
\item Resolve merge
\end{itemize}
Collaborative:
\hbadness=10000
\begin{itemize}
\item Find a partner
\item Create group
......
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