Fix figures and extend key points

episodes/08-conflicts.md

@@ -65,9 +65,9 @@ o - o <- HEAD, master, mummy-info
   - Verify with `git graph`
 
 ```
-      o <- HEAD, mummy-info
+      o - o <- HEAD, mummy-info
      /
-o - o   <- master
+o - o       <- master
 ```
 
 ## Prepare the Conflict
@@ -81,9 +81,9 @@ o - o   <- master
   - Verify with `git graph`
 
 ```
-      o   <- mummy-info
+      o - o  <- mummy-info
      /
-o - o - o <- HEAD, master
+o - o - o    <- HEAD, master
 ```
 
 ## Merge and Resolve the Conflict
@@ -101,9 +101,9 @@ o - o - o <- HEAD, master
   - Highlight that no version/commit is lost in a merge
 
 ```
-        o     <- mummy-info
-      /   \
-o - o - o - o <- HEAD, master
+       o -  o     <- mummy-info
+      /      \
+o - o - o  -  o   <- HEAD, master
 ```
 
 - Clean up the local branch
@@ -111,13 +111,14 @@ o - o - o - o <- HEAD, master
   - Verfiy with `git branch` and `git graph`
 
 ```
-        o
-      /   \
-o - o - o - o <- HEAD, master
+       o -  o
+      /      \
+o - o - o  -  o   <- HEAD, master
 ```
 
 ## Key Points
 
+- Branching is an important concept in Git
 - Git can merge diverging files line-based
   - unless the same line is changed in different ways
 - Resolve conflicts by editing the `<<< ... === ... >>>` sections