Commit 29acb62b authored by Jens Wehner's avatar Jens Wehner
Browse files

updated merge section

parent e6034546
......@@ -85,7 +85,7 @@ To start with:
Walkthrough 1:
\hbadness=10000
\begin{itemize}
\item Log in on GitLab \url{https://gitlab.tue.nl/}.\\
\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/}.
......@@ -105,7 +105,7 @@ Walkthrough 1:
Select ''Log History'' (unless you prefer the former).
\clearpage
\item \textit{Initialise} a new project on GitLab \url{https://gitlab.tue.nl/}.\\[5pt]
\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}\\
......@@ -143,7 +143,7 @@ Walkthrough 1:
The former will stage \textit{all} of the local changes, whilst the latter lets you be more gradual - in this case the effect will of course be the same.
\item Check if the file is on GitLab.\\
Go to \url{https://gitlab.tue.nl/} and click on the project.\\
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.\\
......@@ -159,7 +159,7 @@ Walkthrough 1:
Note that the ''Modification'' value changed from ''Untracked'' to ''Added''.
\item Check if file is on GitLab.\\
Go to \url{https://gitlab.tue.nl/} and click on the project.\\
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}.\\
......@@ -169,7 +169,7 @@ Walkthrough 1:
\includegraphics[width=\linewidth]{Figs/tutorialPart1/firstPush3.PNG}
\item Check GitLab once again.\\
Go to \url{https://gitlab.tue.nl/} and click on the project.\\
Go to \url{https://GitLab.tue.nl/} and click on the project.\\
This time the text file is indeed available.
\end{itemize}
\clearpage
......@@ -208,41 +208,47 @@ With (Branch$\rightarrow$Check out$\rightarrow$)or you simply click on the branc
\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 Make 1 or 2 commits on the master branch.
\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]
\item You have a merge conflict between the two branches, because you modfied the same part of the file in both branches. You can use your text editor to choose the lines you want. But there is a better way..
\item Double click on the file which has the conflict. \\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/conflict_resolve2.png}\\
\item A new window opens which displays three times the same file. You have the two branches on the sides and the result in the middle. \\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/conflict_resolve3.png}\\
\item Use the "Take Left","Take right" or any of the other options to select what should be taken. You can also just write into the file in the middle. Click "save" afterwards.
\item Stage your changes and commit. Your branches should look like this now.\\[5pt]
\includegraphics[width=\linewidth]{Figs/tutorialPart2/merged.png}\\
\end{itemize}
Collaborative:
Collaborative development. Now your partner becomes very useful, finally. You will learn now how to synchronize development with others. This builds heavily on branches and merging.
\hbadness=10000
\begin{itemize}
\item \textit{Create} a new group on GitLab \url{https://gitlab.tue.nl/}.Groups$\rightarrow$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]
\item \textit{Add} yourself and your partner to the group \url{https://GitLab.tue.nl/}.\\[5pt]
\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]
\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 \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 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.
\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]
\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}
......@@ -250,6 +256,7 @@ Tips on good practices
\begin{itemize}
\item Always use instructive commit messages!
\item Make many small commits instead of one large one!
\item Do not push or commit to master, make a separate branch and make a merge request. It is much kinder to others you work with.
\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