Commit 7030ba99 authored by Mihai's avatar Mihai

Commit graph presentation draft

parent 50b79cf6
This diff is collapsed.
\documentclass{article}
\providecommand{\handoutsTitle}{\vspace{0.5cm}Combining changes by merging}
\usepackage{handouts}
\input{../shared/shared}
\begin{document}
\makeHeader
\subsubsection*{Fast-forward merging}
Edit again a file from the GitLab interface and run a \lstinline{git fetch} command on your local machine.
\bigskip
Inspect the \textbf{commit graph} with \lstinline{git log}. Make sure you utilize the options described during the lecture.
\bigskip
Perform a \textbf{fast-forward merge} of the \textbf{origin master} branch into your \textbf{local master} branch.
\bigskip
\subsubsection*{A three-way merge with no conflicts}
The previous section produced a fast-forward merge. In the following you will perform a \textbf{three-way merge}.
\begin{itemize}
\item \emph{Question:} Can you think of a way to get a three-way merge without conflicts?
\end{itemize}
Edit the same file on both your GitLab and local repositories (make sure that different lines are changed).
\bigskip
Run \lstinline{git fetch} on your local repository.
\begin{itemize}
\item \emph{Question:} What does the commit graph of you repository look
like now? Can you draw it on paper?
\end{itemize}
Perform a \textbf{three-way merge} and \textbf{push} to the GitLab remote repository.
\bigskip
\subsubsection*{Resolving a merge conflict}
Now do the same thing again (a three-way merge), but in such a way that the merge
step will result in a merge conflict. Resolve the conflict in a way you feel
is appropriate.
\end{document}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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