add slide for when things for wrong

2022/2022-06-14_git-trilogy-part-3/slides/index.md

@@ -10,11 +10,11 @@
     <img src="slides/img/r3-training-logo.png" height="200px">
     <br><br><br><br>
     <h1>Trilogy of git - Part III</h1>
-    <br><br><br><br>
+    <h2>Contribute using the command line</h2>
+    <br><br><br>
     <h4>
         Laurent Heirendt, Ph.D.<br>
         R3 Team - <a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a><br>
         <i>Luxembourg Centre for Systems Biomedicine</i>
     </h4>
 </div>
-

2022/2022-06-14_git-trilogy-part-3/slides/list.json

@@ -7,6 +7,7 @@
     { "filename": "cloneRepo.md" },
     { "filename": "essential_commands.md" },
     { "filename": "syncFork.md" },
+    { "filename": "thingsGoWrong.md" },
     { "filename": "best_practices.md" },
     { "filename": "thanks.md" }
 ]
\ No newline at end of file

2022/2022-06-14_git-trilogy-part-3/slides/thanks.md

@@ -30,13 +30,8 @@
 
 # Thank you.
 
-<br>
-<center>
-<img src="slides/img/r3-training-logo.png" height="200px">
+<center><img src="slides/img/r3-training-logo.png" height="200px"></center>
 
-<br><br>
 Contact us if you need help:
-<br><br>
-<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a>
 
-</center>
\ No newline at end of file
+<a href="mailto:lcsb-r3@uni.lu">lcsb-r3@uni.lu</a>

2022/2022-06-14_git-trilogy-part-3/slides/thingsGoWrong.md

+# Amend or reverting a commit
+
+* `git commit --amend`: change a commit on `HEAD` (the last commit)
+
+* `git revert <SHA1>`: delete committed commits by reverting the changes.
+
+* A trace is kept in history of the original commit and the reverted one.
+
+
+
+# Rebasing (1)
+
+* `git rebase` enables to shift forward your commits in time
+* Move/combine a sequence of commits to a new base commit
+* Avoid discrepancies when multiple people work on the same project
+* Linear git history (no merge commits)
+* Rebasing is like saying, “I want to base my changes on what everybody has already done.”
+
+Imagine the following situation:
+<div style="top: 14em; left: 25%; position: absolute;">
+    <img src="slides/img/beforeRebase.png" height="500px">
+</div>
+
+* There are commits on `develop` that aren't in `myBranch`.
+
+
+
+# Rebasing (2)
+
+* After rebase, the commits in the `myBranch` branch will be place on top of `develop`.
+
+<div style="top: 5em; left: 25%; position: absolute;">
+    <img src="slides/img/afterRebase.png" height="500px">
+</div>
+
+
+
+# Cherry-picking
+
+* Cherry-picking allows to pick one (or more) specific commits from a list of commits.
+
+* Only the chosen commit(s) are picked, not everything up to that commit.
+
+<div style="top: 8em; left: 25%; position: absolute;">
+    <img src="slides/img/cherryPick.png" height=500px>
+</div>
+
+
+
+# Partial chery-picking
+
+* Partial cherry-picking allows you to unpack the changes from a commit.
+
+* Imagine you committed many files, and you want to remove certain files.
+
+* In practice:
+
+    - You commited all files, and you realize that there is your data inside!
+
+    - You have committed accidentally sensitive data, such as your password
+
+    - You committed hidden files, for instance `.DS_Store` files
+
+    - ...
+
+
+
+
+# Merging branches locally
+
+* Merge a branch into another one locally
+* Combines all the commits from a source branch onto a target branch
+* In practice, this is very useful if you 'just want to try out something', or 'draft' something
+
+
+
+
+# Conflict resolution
+
+* A conflict occurs when two changes change the same line in a file
+
+* Some conflict may be resolved automatically, but major conflicts
+always need to be resolved manually
+
+* Tools exist to streamline conflict resolutions, we use `kdiff3`
+
+* Conflicts can happen during `merge`, `cherry-pick`, and `rebase`
+
+
+
+
+# Reset a branch
+
+* Enables to reset a branch back to a previous commit
+* Discards ALL commits made after the selected commit HEAD
+
+* This happens often in **practice**:
+    you pushed to a branch, then realize that you made a mistake in the commit, and want to start over.
\ No newline at end of file