Skip to content
Snippets Groups Projects
Commit bf04ed06 authored by Philippe Dosch's avatar Philippe Dosch
Browse files

Expanse branchnames in example

parent 3df3e80b
No related branches found
No related tags found
No related merge requests found
......@@ -1512,15 +1512,18 @@
\framesubtitle{Détail des stratégies étudiées}
\begin{enumerate}
\item
1) M: rebase N, delete branch N
\ex{checkout master, rebase nouvfonc, delete branch nouvfonc}
\item
2) M: merge N, delete branch N
\ex{checkout master, merge nouvfonc, delete branch nouvfonc}
\item
3) N: rebase M, M: merge N, delete branch N
\ex{checkout nouvfonc, rebase master, checkout master, merge
nouvfonc, delete branch nouvfonc}
\item
4) N: rebase M, M: merge --no-ff N, delete branch N
\ex{checkout nouvfonc, rebase master, checkout master, merge
-{}-no-ff nouvfonc, delete branch nouvfonc}
\item
5) M: merge N --no-ff, delete branch N
\ex{checkout master, merge nouvfonc -{}-no-ff, delete branch
nouvfonc}
\end{enumerate}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment