From 0f467433bea9ea760973d87c0b1e2379f14e1048 Mon Sep 17 00:00:00 2001
From: Laurent Heirendt <laurent.heirendt@uni.lu>
Date: Mon, 16 Jan 2017 10:29:55 +0100
Subject: [PATCH] Added content for branches slides

---
 branches.md           | 11 ++++++-----
 essential_commands.md |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/branches.md b/branches.md
index 69f185de..4cf120ff 100644
--- a/branches.md
+++ b/branches.md
@@ -3,7 +3,7 @@
 Branch-off within the same repository in order to stay safe!
 
 The master branch:
-<img src="img/branch-0-master.png" class="as-is" />
+<img src="img/branch-master.png" class="branch-master" />
 
 
 ## One branch per feature
@@ -14,7 +14,7 @@ $ git checkout -b matrix_vect_mult_myName
 ```
 The `-b` flag creates the branch.
 
-<img src="img/branch-1-checkout-b.png" class="as-is" />
+<img src="img/branch-create.png" class="branch-create" />
 
 
 ## Switch between branches
@@ -40,22 +40,23 @@ You can switch back to master with
 $ git checkout master
 ```
 
-<div class="fragment">
+
 <br>
 You can use the 5 essential commands as before.
 
 Only difference: you are on your own branch.
 
+<img src="img/branch-commit.png" class="branch-commit" />
+
 
 ## Merge a branch
 
 If you want your feature on the `develop` or `master` branches, merge!
 
-<br>
 **submit a MR or a PR** via the Github/Gitlab interface.
 
+<img src="img/branch-merge.png" class="branch-merge" />
 <div class="fragment">
-<br>
 **ADVANCED**: You can see the differences between branches
 ```sh
 $ git diff master..matrix_vect_mult_myName
diff --git a/essential_commands.md b/essential_commands.md
index f1e31177..2b29de7d 100644
--- a/essential_commands.md
+++ b/essential_commands.md
@@ -95,7 +95,7 @@ $ git pull
 ```
 
 
-## Push your file to the folder
+## Push your file to the repository
 
 ```sh
 $ git push
-- 
GitLab