add 2 parent merge, unmerged slide

1 files changed, 19 insertions, 0 deletions

diff --git a/src/git-in-reverse.tex b/src/git-in-reverse.tex
index fe82ac9..86ed438 100644
--- a/src/git-in-reverse.tex
+++ b/src/git-in-reverse.tex
@@ -842,6 +842,25 @@ Currently, all branches are pointing to the same commit:
 \node (C2) at (0, 3) {C2};
 \node[text=solarizedMagenta] (C2') at (1, 3) {C2};
 \node[text=solarizedMagenta] (C3) at (1, 2) {C3};
+
+\draw[-o,thick] (C0) -- (C1);
+\draw[-o,thick] (C1) -- (C2);
+\draw[-o,thick] (C1) to[in=90,out=-90] (C2');
+\draw[-o,thick] (C2') -- (C3);
+\end{tikzpicture}
+\end{figure}
+\end{frame}
+
+\begin{frame}
+\frametitle{Git± Merging}
+\framesubtitle{$2$-Parent Merge}
+\begin{figure}
+\begin{tikzpicture}
+\node (C0) at (0, 6.5) {C0};
+\node (C1) at (0, 5) {C1};
+\node (C2) at (0, 3) {C2};
+\node[text=solarizedMagenta] (C2') at (1, 3) {C2};
+\node[text=solarizedMagenta] (C3) at (1, 2) {C3};
 \node[text=solarizedOrange] (M1) at (0, 0) {M1};
 
 \coordinate (M) at (0, 0.5);