Commit c8b48c76 authored by Martijn Vermaat's avatar Martijn Vermaat

Preliminary version of merging lecture

parent 6b2439ab
......@@ -41,7 +41,7 @@ GitLab server and using Git for data analysis projects.
| 11:45 | *Practical* | | |
| 12:00 | Lunch | | |
| 13:00 | *Practical* | | |
| 13:30 | **Git conflicts** | Martijn Vermaat | Resolving merge conflicts, protected branches |
| 13:30 | **Combining changes by merging** | Martijn Vermaat | Resolving merge conflicts, protected branches |
| 14:15 | *Practical* | | |
| 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon M. Kiełbasa | More GitLab, Markdown, data analysis use case |
......
../presentation/Makefile
\ No newline at end of file
../presentation/beamerthemelumc.sty
\ No newline at end of file
../presentation/gen2phen_logo.eps
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
../presentation/lgtc_logo.eps
\ No newline at end of file
../presentation/lumc_logo.eps
\ No newline at end of file
../presentation/lumc_logo_small.eps
\ No newline at end of file
This diff is collapsed.
\documentclass{article}
\usepackage{fullpage}
\frenchspacing
\setlength{\parindent}{0pt}
\pagestyle{empty}
\begin{document}
\begin{center}
{\bf Git Introduction Course}
Working with branches in Git practical.
\end{center}
\bigskip
\subsubsection*{Inspect the commit graph.}
We'll work from the repository you created in the previous practical.
\begin{itemize}
\item \emph{Question:} What is your current branch and what is the hash of
the commit it points to?
\item \emph{Question:} What does the commit graph of you repository look
like? Can you draw it on paper?
\end{itemize}
\emph{Hint:} Use \texttt{git log} with the appropriate arguments.
\bigskip
As an alternative to \texttt{git log}, you can also try a graphical viewer
such as \texttt{gitg} (installed on the course laptops) or \texttt{gitk}.
\bigskip
\subsubsection*{Implement a feature in a new branch.}
Let's do some real work (e.g., add some documentation to the project).
\bigskip
Start by creating a branch for your work (give it a descriptive name) and
switch to it.
\begin{itemize}
\item \emph{Question:} What branches are there now and what are the commits
they point to?
\end{itemize}
\bigskip
Implement your feature (e.g. write documentation) and commit your changes.
\begin{itemize}
\item \emph{Question:} What does the commit graph of you repository look
like now?
\end{itemize}
\bigskip
\subsubsection*{Merge your feature.}
Of course we want this nice feature in our \texttt{master} branch.
\bigskip
\begin{itemize}
\item \emph{Question:} If you want to merge branch \texttt{B} into branch
\texttt{A}, what should be your current branch?
\end{itemize}
\bigskip
Merge your feature branch into \texttt{master}.
\begin{itemize}
\item \emph{Question:} What does the commit graph of you repository look
like now?
\end{itemize}
\bigskip
Since you merged it, you can now delete the feature branch.
\bigskip
\subsubsection*{A three-way merge.}
Unless you were extremely zealous, the last section produced a fast-forward
merge.
\bigskip
\begin{itemize}
\item \emph{Question:} Can you think of a way to get a three-way merge?
\end{itemize}
\bigskip
Manipulate your repository in such a way that the commit graph contains a
merge commit (created by a three-way merge).
\begin{itemize}
\item \emph{Question:} What does the commit graph of you repository look
like now?
\end{itemize}
\end{document}
../presentation/nbic_logo.eps
\ No newline at end of file
../presentation/ngi_logo.eps
\ No newline at end of file
../presentation/nwo_logo_en.eps
\ No newline at end of file
../presentation/ul_logo.eps
\ No newline at end of file
......@@ -2,7 +2,7 @@
\title{Git and remote repositories}
\providecommand{\myConference}{Git course}
\providecommand{\myDate}{Tuesday, November 30, 2015}
\providecommand{\myDate}{Tuesday, December 1, 2015}
\author{Martijn Vermaat}
\providecommand{\myGroup}{Leiden Genome Technology Center}
\providecommand{\myDepartment}{Department of Human Genetics}
......
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