Commit e6034546 authored by Kronberg, V.C.E.'s avatar Kronberg, V.C.E.
Browse files

Merge branch 'sceMaster'

parents 95a117a1 8a661ec3
......@@ -78,7 +78,7 @@
To start with:
\hbadness=10000
\begin{itemize}
\item Refresher colloquium + GitKraken installation.
\item Refresher colloquium + SmartGit installation.
\item Tell everyone to find a partner.
\end{itemize}
......@@ -88,6 +88,8 @@ Walkthrough 1:
\item Log in on GitLab \url{https://gitlab.tue.nl/}.\\
\includegraphics[width=\linewidth]{Figs/tutorialPart1/loginGitLab.png}
\item Download and install SmartGit from \url{https://www.syntevo.com/smartgit/download/}.
\item Set up SmartGit.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/setup1.PNG}\\
Start SmartGit and tick the terms of agreement (after reading them, of course) and select ''Non-commercial use only (most features, no support).\\
......@@ -111,9 +113,9 @@ Walkthrough 1:
\item \textit{Clone} the project using SmartGit.\\[3pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/firstStart.PNG}\\
Select ''Clone existing repository'' (if the window does not pop up got go ''Repository'' $\rightarrow$ ''Clone''.\\[5pt]
Select ''Clone existing repository'' (if the window does not pop up got go ''Repository'' $\rightarrow$ ''Clone'').\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/configRemote0.png}\\
Go back to \url{https://gitlab.tue.nl/} and clock on the project and the blue clone button. Copy the HTTPS URL.
Go back to \url{https://gitlab.tue.nl/} and click on the project and the blue clone button. Copy the HTTPS URL.
\clearpage
\includegraphics[width=\linewidth]{Figs/tutorialPart1/configRemote1.PNG}\\
......@@ -131,7 +133,8 @@ Walkthrough 1:
\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.
Platform specific - anything will do and you can create a new one with some text in it.\\
Note that Microsoft files are binary files, and as such they are not suitable for git! (i.e.\ no Word documents, PowerPoint presentations, etc)
\item \textit{Stage} the new file.\\
\includegraphics[width=0.8\linewidth]{Figs/tutorialPart1/stageButton.PNG}%
......@@ -144,7 +147,7 @@ Walkthrough 1:
The file is not there.
\item \textit{Commit} the file with a commit message.\\
Go back to GitKraken.\\[5pt]
Go back to SmartGit.\\[5pt]
\includegraphics[width=0.8\linewidth]{Figs/tutorialPart1/commitButton.PNG}%
\includegraphics[width=0.2\linewidth]{Figs/tutorialPart1/commitContext.PNG}\\
Click on the ''Commit'' button in the toolbar or use the context menu entry.\\
......@@ -162,7 +165,7 @@ Walkthrough 1:
\item \textit{Push} the staged commits to the \textit{remote repository}.\\
Go back to SmartGit.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart1/firstPush1.PNG}\\
Click the upwards facing arrow which says ''Push'', and note that the green icon which says ''master'' fits snugly unto the yellow ''origin/master'' one - this indicates parity between the \textit{remote} (origin/master) and \textit{local} (master) \textit{repositories}.\\
Click the upwards facing arrow which says ''Push'', and note that the green icon which says ''master'' fits snugly into the yellow ''origin/master'' one - this indicates parity between the \textit{remote} (origin/master) and \textit{local} (master) \textit{repositories}.\\
\includegraphics[width=\linewidth]{Figs/tutorialPart1/firstPush3.PNG}
\item Check GitLab once again.\\
......@@ -174,10 +177,11 @@ Walkthrough 1:
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.
\item Create one or several new text files.
\item Perform a couple of \textit{commits}.
\item \textit{Stage} multiple files and several changes at once.
\item \textit{Push} a few times to the remote repository.
\item \textit{Revert} an old commit.
\end{itemize}
For those who want a challenge, try to
......
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