From 8d49cebcc71e708ea4bded17bc6906085ff6a220 Mon Sep 17 00:00:00 2001
From: Jonathan Hodgson <git@jonathanh.co.uk>
Date: Fri, 7 Aug 2020 13:04:50 +0100
Subject: [PATCH] Adds a couple of notes and adds to tikz merge pictures

---
 main.latex | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/main.latex b/main.latex
index f9ff9a2..4d44494 100644
--- a/main.latex
+++ b/main.latex
@@ -443,6 +443,7 @@
 	\framesubtitle{Commit early, commit often}
 	\begin{itemize}
 		\item Every time you complete a small change or fix a bug
+		\item For each point on a detailed to-do list
 		\item You don't normally want to commit broken code (intentionally at least)
 		\item In some instances you might want to auto-commit - but probably not too often.
 			\begin{itemize}
@@ -501,6 +502,8 @@
 	\note{%
 		Diff is pretty smart. It will normally work for whatever combinations of commits, references
 		(more on that later) or files.
+
+		Change Hello to Hello World
 	}
 \end{frame}
 
@@ -696,12 +699,14 @@
 			\node[commit] at (2,0) (commit2) {A};
 			\node[commit] at (4,0) (commit3) {B};
 			\node[commit] at (4,-2) (commit3b) {C};
+			\node[anchor=west] at (4.5,0.5) {+Bugfix};
+			\node[anchor=west] at (4.5,-2.5) {+Feature};
 			\draw[arrow] (commit1) -- (commit2);
 			\draw[arrow] (commit2) -- (commit3);
 			\draw[arrow] (commit2) -- (commit3b);
-			\draw[draw=red] (-1,1) rectangle (5,-0.99);
+			\draw[draw=red] (-1,1) rectangle (6.5,-0.99);
 			\node[fill=red,text=white,anchor=north west] at (-1,1) {Branch 1};
-			\draw[draw=green] (-1,-1) rectangle (5,-3);
+			\draw[draw=green] (-1,-1) rectangle (6.5,-3);
 			\node[fill=green,text=white,anchor=north west] at (-1,-1) {Branch 2};
 		\end{tikzpicture}
 	\end{center}
@@ -728,15 +733,18 @@
 			\node[commit] at (8,0) (commit5) {C};
 			\node[commit] at (4,-2) (commit3b) {};
 			\node[commit] at (6,-2) (commit4b) {B};
+			\node[anchor=west] at (5.5,0.5) {+Bugfix};
+			\node[anchor=west] at (6.5,-2.5) {+Feature};
+			\node[anchor=south west] at (8.7,-0.2) {\parbox{\textwidth}{+Bugfix \\ +Feature}};
 			\draw[arrow] (commit1) -- (commit2);
 			\draw[arrow] (commit2) -- (commit4);
 			\draw[arrow] (commit4) -- (commit5);
 			\draw[arrow] (commit2) -- (commit3b);
 			\draw[arrow] (commit3b) -- (commit4b);
 			\draw[arrow] (commit4b) -- (commit5);
-			\draw[draw=red] (-1,1) rectangle (9,-0.99);
+			\draw[draw=red] (-1,1) rectangle (10.5,-0.99);
 			\node[fill=red,text=white,anchor=north west] at (-1,1) {Branch 1};
-			\draw[draw=green] (-1,-1) rectangle (9,-3);
+			\draw[draw=green] (-1,-1) rectangle (10.5,-3);
 			\node[fill=green,text=white,anchor=north west] at (-1,-1) {Branch 2};
 		\end{tikzpicture}
 	\end{center}