[release] Regular merge of develop

2022/2022-05-31_git-trilogy-part-1/slides/branches.md

 # New term:  <font color="color:red">branch</font>
 
-* A sequence of commits (changes) is referred to as **branch**.
-* A new branch can be created by __branching off__ from a commit.
-* A **branch** can be understood as a named **version** of your repository.
+* A sequence of commits (changes) is referred to as *branch*.
+* A new branch can be created by *branching off* from a commit on another branch.
+* A *branch* can be understood as a named *version* of your repository.
 
 <div style="position:absolute;left:50%;top:1em">
 <img src="slides/img/branch_branch-off_detail.png" class="as-is" height="800px"/>
@@ -14,7 +14,7 @@
 
 Generally, in a repository, there are guidelines for contributing.
 
-<div class="fragment">
+<br>
 
 A common development scheme is dual with a:
 
@@ -48,33 +48,39 @@ Best practice is to <font color="red">create a new **branch**!</font>
 <img src="slides/img/branch_my-branch.png" height="800em"/>
 </div>
 
-<br> 
+<br>
 
 Using branches ensures:
-* your changes are made separately from other changes
-* your version won't be affected by others
-* all related changes are aggregated on one place
+* your changes are made separately from other (unrelated) changes
+* your version will not be affected by other contributors
+* all related changes are aggregated in one place
 * work can continue if the development of one feature gets stuck
 
+<br>
 Are you working on more features in parallel?
 
-<font color="red">Create a new **branch**!</font> for each of them :)
+<font color="red">Create a new **branch**!</font> for each of them!
+
+
 
 
 
+# Quick recap
 
+What is the difference between a *fork* and a *branch*?
 
-# Time to practice!
+<div class="fragment">
+<br><br><br>
+<div align="center">
+<img src="slides/img/forking_detail-with-branches.png" height="500em"/>
+</div>
 
-1. What is the difference between **fork** and **branch**?
-    <div class="fragment fade-in-then-out">
-    <div style="position:absolute;left:10%;top:8em">
-    <img src="slides/img/forking_detail-with-branches.png" height="500em"/>
-    </div>
 
-2. Why is best practice to branch off from `develop`?
-3. Switch between branches
-    <div class="fragment fade-in-then-out">
-    <div style="position:absolute;left:10%;top:8em">
-    <img src="slides/img/branch_GUI_switch.png" height="500em"/>
-    </div>
+
+# How to switch between branches?
+
+<div style="position:absolute;left:10%;top:8em">
+<img src="slides/img/branch_GUI_switch.png" height="500em"/>
+</div>
+
+Why is best practice to branch off from `develop`?
\ No newline at end of file