Commit 23c68a61 authored by Jens Wehner's avatar Jens Wehner
Browse files

added pictures to presentation

parent 4556aee0
......@@ -153,38 +153,51 @@ Tutorial part 2:
Branches are very useful if you want to try out different approaches. Although they are most useful when working with others, even alone it is good if you want to explore a new idea.
\hbadness=10000
\begin{itemize}
\item First use your repo or make a new one and make 3-4 commits on the master branch.
\item Create branch (Branch$\leftarrow$Add Branch). Depending on what you clicked after naming the branch, you are either still on master or are already on the new branch.
With (Branch$\leftarrow$Check out$\leftarrow$)or you simply click on the branch name in the bottom left corner. Make sure you are on your new branch.
\item Edit a file and create a new commit on the new branch. Maybe 1-2 commits.
\item Checkout the master branch again. All the changes from before are now gone (i.e. they are on the other branch). Click on the tickmark next to the branchname in the bottom left to make it visible.
\item First use your repo or make a new one and make 3-4 commits on the master branch. \\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/before.png}\\
\item Create branch (Branch$\rightarrow$Add Branch). Depending on what you clicked after naming the branch, you are either still on master or are already on the new branch.
With (Branch$\rightarrow$Check out$\rightarrow$)or you simply click on the branch name in the bottom left corner. Make sure you are on your new branch. \\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/checkoutbranch.png}\\
\item Edit a file and create a new commit on the new branch. Maybe 1-2 commits.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/addtofeaturebranch.png}\\
\item Checkout the master branch again. All the changes from before are now gone (i.e. they are on the other branch). Click on the tickmark next to the branchname in the bottom left to make it visible. \\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/checkout_master.png}\\
\item make 1 or 2 commits on the master branch.
\item Your branches should look like this now.
\item Right click on your branch and select merge. Use your text editor to choose the lines you want. Stage your changes and commit.
\item Your branches should look like this now.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/branchbeforemerge.png}\\
\item Right click on your branch and select merge. \\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/duringmerge.png}\\
\item Use your text editor to choose the lines you want. Stage your changes and commit. Your branches should look like this now.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/merged.png}\\
\end{itemize}
Collaborative:
\hbadness=10000
\begin{itemize}
\item Find a partner
\item \textit{Create} a new group on GitLab \url{https://gitlab.tue.nl/}.Groups$\leftarrow$your Groups\\[5pt]
\item \textit{Create} a new group on GitLab \url{https://gitlab.tue.nl/}.Groups$\rightarrow$your Groups\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/createGroup.png}\\
Click on ''New group''.\\[5pt]
Groups are not necessary to work on a shared project. So you can also skip this step and add people directly to the project.
\item \textit{Add} yourself and your partner to the group \url{https://gitlab.tue.nl/}.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/createGroup.png}\\
\includegraphics[width=\linewidth]{Figs/tutorialPart2/addpeopletogroup.png}\\
Click on ''New group''.\\[5pt]
\item \textit{Create} a new repo on GitLab \url{https://gitlab.tue.nl/}.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/createproject.png}\\
Click on ''New project''.\\[5pt]
You can also use an old repository from earlier.
\item \textit{Create} a new repo on GitLab \url{https://gitlab.tue.nl/}.\\[5pt]
\item If you did not create a group you can add people to the project now.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/addpeopletoproject.png}\\
Click on ''New project''.\\[5pt]
\item Both clone the repository and make changes to the same file on your computer. Push the changes and see what happens.
\item One of you will not be able to push your changes. Pull the up to version and merge locally.
\item instead you can also create your own branches and then merge them into the main branch via a Merge Request. So you do not always have to merge before pushing to Gitlab.
\item if you are bored create an issue for the project and assign your colleague.
\item One of you will not be able to push your changes. Pull the up to date version from the server and merge locally then push the changes to the server.
\item instead you can also create your own branches push them to gitlab and then merge them into the main branch via a Merge Request. So you do not always have to merge before pushing to Gitlab.
\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/merge_request_start.png}\\ [5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/merge_request_2.png}\\ [5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/submit_merge_request.png}\\ [5pt]
\item if you are bored create an issue for the project and assign your colleague.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/createIssue.png}\\
\end{itemize}
......
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