diff --git a/2019/2019-09-24_advancedGitTraining/slides/amend.md b/2019/2019-09-24_advancedGitTraining/slides/amend.md
new file mode 100644
index 0000000000000000000000000000000000000000..8db2bac6fc6c2468d3ae4fb810ad85d3dd79b0b7
--- /dev/null
+++ b/2019/2019-09-24_advancedGitTraining/slides/amend.md
@@ -0,0 +1,61 @@
+# Theory: Git Amend
+
+* Enables to change the specifics of the commit on HEAD (the last commit)
+
+
+
+
+# Practical: Git Amend
+
+* Start by creating and committing a file
+```bash
+$ echo "This file contains errors and needs to be amended" > amend.txt
+$ git add amend.txt
+$ git commit -m "this file needs to be amended"
+```
+
+* Check the commit
+```bash
+$ git log
+```
+
+
+
+# Practical: Git Amend - Commit Message
+
+* Verify that your staging area is clear:
+```bash
+$ git status
+```
+
+* use the `commit --amend` with the `-m` flag to edit only the commit message:
+```bash
+$ git commit --amend -m "This commit title has been amended"
+```
+
+* See the commit message in the log has changed:
+```bash
+$ git log
+```
+
+
+
+# Practical: Git Amend - Commit Content
+
+* In your editor, change the text in the amend.txt file:
+```bash
+"This file's content have been corrected"
+```
+
+* Check if the changed file is in the staging area:
+```bash
+$ git status
+```
+
+* With the changes stages use the following command to commit the changes into the previous commit:
+```bash
+$ git commit --amend -no-edit
+```
+
+* This will create and commit a new commit with the staged changes added.
+* Force push your changes to develop
diff --git a/2019/2019-09-24_advancedGitTraining/slides/amendIntro.md b/2019/2019-09-24_advancedGitTraining/slides/amendIntro.md
deleted file mode 100644
index 82e827983bc712b3a74922ed2a6a6d0e55ab818f..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/amendIntro.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Theory: Git Amend
-
-* Enables to change the specifics of the commit on HEAD (the last commit)
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/amendPresentation1.md
deleted file mode 100644
index 3875c453a94d003f849d858bfb0971860b642ff4..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation1.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Practical: Git Amend
-
-* Start by creating and committing a file
-```bash
-$ echo "This file contains errors and needs to be amended" > amend.txt
-$ git add amend.txt
-$ git commit -m "this file needs to be amended"
-```
-
-* Check the commit
-```bash
-$ git log
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation2.md b/2019/2019-09-24_advancedGitTraining/slides/amendPresentation2.md
deleted file mode 100644
index 53d82aba273b0f16e8b5324a6dd7814922462fd0..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation2.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Practical: Git Amend - Commit Message
-
-* Verify that your staging area is clear:
-```bash
-$ git status
-```
-
-* use the `commit --amend` with the `-m` flag to edit only the commit message:
-```bash
-$ git commit --amend -m "This commit title has been amended"
-```
-
-* See the commit message in the log has changed:
-```bash
-$ git log
-```
diff --git a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation3.md b/2019/2019-09-24_advancedGitTraining/slides/amendPresentation3.md
deleted file mode 100644
index bae91bc9b90b972b3eb7ea9cd6518da06e9c6cf1..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation3.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Practical: Git Amend - Commit Content
-
-* In your editor, change the text in the amend.txt file:
-```bash
-"This file's content have been corrected"
-```
-
-* Check if the changed file is in the staging area:
-```bash
-$ git status
-```
-
-* With the changes stages use the following command to commit the changes into the previous commit:
-```bash
-$ git commit --amend -no-edit
-```
-
-* This will create and commit a new commit with the staged changes added.
-* Force push your changes to develop
diff --git a/2019/2019-09-24_advancedGitTraining/slides/chPick.md b/2019/2019-09-24_advancedGitTraining/slides/chPick.md
new file mode 100644
index 0000000000000000000000000000000000000000..154c259c10296a1e0c1b991177af049baad07b77
--- /dev/null
+++ b/2019/2019-09-24_advancedGitTraining/slides/chPick.md
@@ -0,0 +1,51 @@
+# Theory: Git Cherry-picking
+
+* It enables the user to pick specific commits from a list of commits.
+
+Careful!
+Cherry picking only picks the selected commit,
+not everything up to that commit.
+
+<div style="top: 15em; left: 30%; position: absolute;">
+ <img src="slides/img/cherryPick.png">
+</div>
+
+
+
+# Practical: Git Cherry-picking
+
+* In your branch, create and commit a reference file
+```bash
+$ echo "This is the start of a commit chain" > reference.txt
+$ git add reference.txt
+$ git commit origin myBranch
+```
+
+* Create and commit two files in the develop branch
+```bash
+$ echo "This is a commit to keep" > keep.txt
+$ git add keep.txt
+$ git commit origin develop
+$ echo "Ignore this commit" > ignore.txt
+$ git add ignore.txt
+$ git commit origin develop
+```
+
+
+
+# Practical: Git Cherry-picking
+
+* Check the commit reference of the two commits in develop
+* Chose the commit to keep and add it to your branch
+```bash
+$ git checkout myBranch
+$ git cherry-pick <commit reference>
+```
+* Check the log again and see if the changes were applied correctly
+
+* push the changes to the develop branch
+```bash
+$ git push origin myBranch -f
+```
+
+* The `-f` flag is used to force push into develop
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/chPickIntro.md b/2019/2019-09-24_advancedGitTraining/slides/chPickIntro.md
deleted file mode 100644
index eb8f63f84a705ac686d3ac616f6c69d968ab6a5d..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/chPickIntro.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Theory: Git Cherry-picking
-
-* It enables the user to pick specific commits from a list of commits.
-
-Careful!
-Cherry picking only picks the selected commit,
-not everything up to that commit.
-
-<div style="top: 15em; left: 30%; position: absolute;">
- <img src="slides/img/cherryPick.png">
-</div>
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/chPickPresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/chPickPresentation1.md
deleted file mode 100644
index 5f5fe387b29daf0795b6def5b3e668fa319182a3..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/chPickPresentation1.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Practical: Git Cherry-picking
-
-* In your branch, create and commit a reference file
-```bash
-$ echo "This is the start of a commit chain" > reference.txt
-$ git add reference.txt
-$ git commit origin myBranch
-```
-
-* Create and commit two files in the develop branch
-```bash
-$ echo "This is a commit to keep" > keep.txt
-$ git add keep.txt
-$ git commit origin develop
-$ echo "Ignore this commit" > ignore.txt
-$ git add ignore.txt
-$ git commit origin develop
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/chPickPresentation2.md b/2019/2019-09-24_advancedGitTraining/slides/chPickPresentation2.md
deleted file mode 100644
index 910ac9ee75c8cce96ddfe71891f52d5f957af2a5..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/chPickPresentation2.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Practical: Git Cherry-picking
-
-* Check the commit reference of the two commits in develop
-* Chose the commit to keep and add it to your branch
-```bash
-$ git checkout myBranch
-$ git cherry-pick <commit reference>
-```
-* Check the log again and see if the changes were applied correctly
-
-* push the changes to the develop branch
-```bash
-$ git push origin myBranch -f
-```
-
-* The `-f` flag is used to force push into develop
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/conflict.md b/2019/2019-09-24_advancedGitTraining/slides/conflict.md
new file mode 100644
index 0000000000000000000000000000000000000000..a65d340d9f2d145479dba77a1e8be125321f313a
--- /dev/null
+++ b/2019/2019-09-24_advancedGitTraining/slides/conflict.md
@@ -0,0 +1,77 @@
+# Theory: Conflict resolution
+
+* A conflict emerges when two files push two different changes
+to a one target branch
+
+* Some conflict may be resolved automatically, but major conflicts
+always need to be resolved manually
+
+* Tools exist to streamline conflict resolutions, we use kdiff3
+
+
+
+# Practical: Conflict resolution using kdiff3
+
+* create a branch named changeMicheal and in the editor you change
+the content of `Michael.md`:
+```bash
+$ git checkout develop
+$ git checkout -b changeMichael
+```
+
+Change Michael file...
+
+```bash
+$ git fetch upstream
+$ git checkout develop
+$ git merge upstream/develop
+```
+
+summary:
+michael.md on develop:
+```
+# Michael
+```
+
+michael.md on changeMichael (example)
+```
+## Michael Evans
+```
+
+
+
+# Practical: Conflict resolution using kdiff3
+
+If then there is a rebase done on develop:
+```bash
+$ git rebase develop
+```
+A conflict should emerge
+
+* When facing the merge conflict message, use the command
+```bash
+$ git mergetool
+```
+
+* This opens kdiff3 if it was properly set up. Selecting A will keep the changes of the target branch,
+while B will keep your changes. Selecting A and B will combine both changes to the merged file.
+
+
+
+
+# Practical: Conflict resolution using kdiff3
+
+* After resolving the conflicts, continue in your terminal
+```bash
+$ git rebase --continue
+```
+* Then check the status:
+```bash
+$ git status
+```
+
+* It shows you a `.orig` file. This `.orig` file contains information about the conflict.
+```bash
+$ rm _attendees/michael.md.orig
+```
+* You can either `rm` the `.orig` file, or you can use `git clean -fdx`.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/conflictIntro.md b/2019/2019-09-24_advancedGitTraining/slides/conflictIntro.md
deleted file mode 100644
index 8970946b00c0737ea3ea87f62fe041c6b6a57136..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/conflictIntro.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Theory: Conflict resolution
-
-* A conflict emerges when two files push two different changes
-to a one target branch
-
-* Some conflict may be resolved automatically, but major conflicts
-always need to be resolved manually
-
-* Tools exist to streamline conflict resolutions, we use kdiff3
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation1.md
deleted file mode 100644
index baeb3790aa5096f07c80937e31ee3363608806c1..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation1.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Practical: Conflict resolution using kdiff3
-
-* create a branch named changeMicheal and in the editor you change
-the content of `Michael.md`:
-```bash
-$ git checkout develop
-$ git checkout -b changeMichael
-```
-
-Change Michael file...
-
-```bash
-$ git fetch upstream
-$ git checkout develop
-$ git merge upstream/develop
-```
-
-summary:
-michael.md on develop:
-```
-# Michael
-```
-
-michael.md on changeMichael (example)
-```
-## Michael Evans
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation2.md b/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation2.md
deleted file mode 100644
index 9977864539b71d208631e49665741b898ff4a951..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation2.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Practical: Conflict resolution using kdiff3
-
-If then there is a rebase done on develop:
-```bash
-$ git rebase develop
-```
-A conflict should emerge
-
-* When facing the merge conflict message, use the command
-```bash
-$ git mergetool
-```
-
-* This opens kdiff3 if it was properly set up. Selecting A will keep the changes of the target branch,
-while B will keep your changes. Selecting A and B will combine both changes to the merged file.
-
diff --git a/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation3.md b/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation3.md
deleted file mode 100644
index 93df0456d57009fd3b77af11168ceb0537d7b1b5..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation3.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Practical: Conflict resolution using kdiff3
-
-* After resolving the conflicts, continue in your terminal
-```bash
-$ git rebase --continue
-```
-* Then check the status:
-```bash
-$ git status
-```
-
-* It shows you a `.orig` file. This `.orig` file contains information about the conflict.
-```bash
-$ rm _attendees/michael.md.orig
-```
-* You can either `rm` the `.orig` file, or you can use `git clean -fdx`.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/headRebase-iPresentation.md b/2019/2019-09-24_advancedGitTraining/slides/headRebase-iPresentation.md
deleted file mode 100644
index 45717dc4f6dd5b69d35b044da4d74c38e20ee7cb..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/headRebase-iPresentation.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Practical: Amending with Git Rebase
-
-```bash
-$ git rebase -i HEAD~3
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/headRebase-iIntro.md b/2019/2019-09-24_advancedGitTraining/slides/headRebase.md
similarity index 74%
rename from 2019/2019-09-24_advancedGitTraining/slides/headRebase-iIntro.md
rename to 2019/2019-09-24_advancedGitTraining/slides/headRebase.md
index 01d0cdd1e25e94579f573ba93732b8525ea71121..e38db5aaaee3e17a1fcc06e4819a81d5bccce973 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/headRebase-iIntro.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/headRebase.md
@@ -4,4 +4,12 @@
* The flag HEAD~X will let you amend the X previous commits instead of just the last one
-* In the Interactive rebase menu, be sure to select the `edit` option.
\ No newline at end of file
+* In the Interactive rebase menu, be sure to select the `edit` option.
+
+
+
+# Practical: Amending with Git Rebase
+
+```bash
+$ git rebase -i HEAD~3
+```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/index.md b/2019/2019-09-24_advancedGitTraining/slides/index.md
index 8c0183b1210dd5d20617786f94b84116de5111cf..c177c57cad1470b28016ec239d10679cebe12df1 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/index.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/index.md
@@ -1,6 +1,6 @@
# Advanced Git Training
-## August 21st, 2019
+## September 24, 2019
<div style="top: 6em; left: 0%; position: absolute;">
<img src="theme/img/lcsb_bg.png">
@@ -9,11 +9,11 @@
<div style="top: 5em; left: 60%; position: absolute;">
<img src="slides/img/r3-training-logo.png" height="200px">
<br><br><br>
- <h1>Git Advanced Tutorial</h1>
+ <h1>Advanced Git Practices</h1>
<br><br><br>
<h4>
- Daniel Tojal, Title<br><br>
- daniel.duarte.001@student.uni.lu<br><br>
+ Laurent Heirendt, PhD<br><br>
+ laurent.heirendt@uni.lu<br><br>
<i>Luxembourg Centre for Systems Biomedicine</i>
</h4>
-</div>
\ No newline at end of file
+</div>
diff --git a/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install2.md b/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install.md
similarity index 71%
rename from 2019/2019-09-24_advancedGitTraining/slides/kdiff3Install2.md
rename to 2019/2019-09-24_advancedGitTraining/slides/kdiff3Install.md
index 13dba2156e6b36f5fae40a68c73c25e5abab2c1f..7bff832f9ef17ce95d81be4fd24f484b25712130 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install2.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install.md
@@ -1,3 +1,13 @@
+# Installing kdiff3
+
+* Recommended tool: KDiff3
+
+* Download it here: https://sourceforge.net/projects/kdiff3/files/
+
+* The downloadable file should match your OS
+
+
+
# Setting up kdiff3
```bash
diff --git a/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install1.md b/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install1.md
deleted file mode 100644
index cf1e4c1e5b13a6b770b6ba1c22f0bea06b75a753..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/kdiff3Install1.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Installing kdiff3
-
-* Recommended tool: KDiff3
-
-* Download it here: https://sourceforge.net/projects/kdiff3/files/
-
-* The downloadable file should match your OS
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/list.json b/2019/2019-09-24_advancedGitTraining/slides/list.json
index da1d468fe4809fe89acffade55fe329943651d93..6792dbdf72bd4eca83b908ced9507b6731a9dd46 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/list.json
+++ b/2019/2019-09-24_advancedGitTraining/slides/list.json
@@ -1,177 +1,15 @@
[
- {
- "filename": "index.md",
- "attr": {
- }
- },
- {
- "filename": "overview.md",
- "attr": {
- }
- },
- {
- "filename": "gettingStarted.md",
- "attr": {
- }
- },
- {
- "filename": "rebaseIntro.md",
- "attr": {
- }
- },
- {
- "filename": "rebaseIntro2.md",
- "attr": {
- }
- },
- {
- "filename": "rebasePresentation1.md",
- "attr": {
- }
- },
- {
- "filename": "rebasePresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "rebase-iIntro.md",
- "attr": {
- }
- },
- {
- "filename": "rebase-iPresentation1.md",
- "attr": {
- }
- },
- {
- "filename": "rebase-iPresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "rebase-iPresentation3.md",
- "attr": {
- }
- },
- {
- "filename": "rebase-iPresentation4.md",
- "attr": {
- }
- },
- {
- "filename": "chPickIntro.md",
- "attr": {
- }
- },
- {
- "filename": "chPickPresentation1.md",
- "attr": {
- }
- },
- {
- "filename": "chPickPresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "revertIntro.md",
- "attr": {
- }
- },
- {
- "filename": "revertPresentation.md",
- "attr": {
- }
- },
- {
- "filename": "resetIntro.md",
- "attr": {
- }
- },
- {
- "filename": "resetPresentation.md",
- "attr": {
- }
- },
- {
- "filename": "amendIntro.md",
- "attr": {
- }
- },
- {
- "filename": "amendPresentation1.md",
- "attr": {
- }
- },
- {
- "filename": "amendPresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "amendPresentation3.md",
- "attr": {
- }
- },
- {
- "filename": "headRebase-iIntro.md",
- "attr": {
- }
- },
- {
- "filename": "headRebase-iPresentation.md",
- "attr": {
- }
- },
- {
- "filename": "mergeIntro.md",
- "attr": {
- }
- },
- {
- "filename": "mergePresentation1.md",
- "attr": {
- }
- },
- {
- "filename": "mergePresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "conflictIntro.md",
- "attr": {
- }
- },
- {
- "filename": "kdiff3Install1.md",
- "attr": {
- }
- },
- {
- "filename": "kdiff3Install2.md",
- "attr": {
- }
- },
- {
- "filename": "conflictPresentation1.md",
- "attr": {
- }
- },
- {
- "filename": "conflictPresentation2.md",
- "attr": {
- }
- },
- {
- "filename": "conflictPresentation3.md",
- "attr": {
- }
- },
- {
- "filename": "thanks.md",
- "attr": {
- }
- }
+ { "filename": "index.md" },
+ { "filename": "overview.md" },
+ { "filename": "gettingStarted.md" },
+ { "filename": "rebase.md" },
+ { "filename": "chPick.md" },
+ { "filename": "revert.md" },
+ { "filename": "reset.md" },
+ { "filename": "amend.md" },
+ { "filename": "headRebase.md" },
+ { "filename": "merge.md" },
+ { "filename": "conflict.md" },
+ { "filename": "kdiff3Install.md" },
+ { "filename": "thanks.md" }
]
diff --git a/2019/2019-09-24_advancedGitTraining/slides/mergePresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/merge.md
similarity index 51%
rename from 2019/2019-09-24_advancedGitTraining/slides/mergePresentation1.md
rename to 2019/2019-09-24_advancedGitTraining/slides/merge.md
index cdcd0815beaa76dacde76e67809c86a841e0b45e..921ef8a550188065fd22ee60ed603663dab42c0b 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/mergePresentation1.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/merge.md
@@ -1,3 +1,9 @@
+# Theory: Merging branches
+
+* Combines all the commits from a source branch onto a target branch
+
+
+
# Practical: Merging branches
* Create a new branch from your own branch:
@@ -15,4 +21,21 @@ $ git commit -m "first commit to be merged"
$ echo "Code that is merged into myBranch" > merge2.txt
$ git add merge2.txt
$ git commit -m "second commit to be merged"
-```
\ No newline at end of file
+```
+
+
+
+# Practical: Merging branches
+
+* Check the commit log of the myBranch and Feature1 branch
+```bash
+$ git log
+```
+
+* Go to myBranch and merge the Feature1 branch into it
+```bash
+$ git merge Feature1
+```
+
+* This will move all changes made in the Feature1 branch
+onto myBranch, effectively fusing the two together.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/mergeIntro.md b/2019/2019-09-24_advancedGitTraining/slides/mergeIntro.md
deleted file mode 100644
index 7212c55fd5cac807984cd64a304695c963ae76ed..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/mergeIntro.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Theory: Merging branches
-
-* Combines all the commits from a source branch onto a target branch
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/mergePresentation2.md b/2019/2019-09-24_advancedGitTraining/slides/mergePresentation2.md
deleted file mode 100644
index 5683ccf3ff0f05ff203fc1befda0e7f4a9b74d29..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/mergePresentation2.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Practical: Merging branches
-
-* Check the commit log of the myBranch and Feature1 branch
-```bash
-$ git log
-```
-
-* Go to myBranch and merge the Feature1 branch into it
-```bash
-$ git merge Feature1
-```
-
-* This will move all changes made in the Feature1 branch
-onto myBranch, effectively fusing the two together.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/overview.md b/2019/2019-09-24_advancedGitTraining/slides/overview.md
index 3509be169c2e91ad8b6777ba1421cafb38a3d0a2..39b55e411c722f9df659a8282c006b9d8b66a584 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/overview.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/overview.md
@@ -1,17 +1,9 @@
# Overview
-1. Rebasing in Git: Theory
-1. Rebasing in Git: Practical
-2. Git cherry-picking: Theory
-2. Git cherry-picking: Practical
-3. Reverting commits: Theory
-3. Reverting commits: Practical
-4. Resetting to a previous commit: Theory
-4. Resetting to a previous commit: Practical
-5. Amend last commit: Theory
-5. Amend last commit: Practical
-6. Amending using Interactive rebasing
-7. Merging branches: Theory
-7. Merging branches: Practical
-8. Conflict Resolution: Theory
-8. Conflict Resolution: Practical
\ No newline at end of file
+1. Rebasing in Git
+2. Git cherry-picking
+3. Reverting commits
+4. Resetting to a previous commit
+5. Amend last commit
+7. Merging branches
+8. Conflict Resolution
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebase-iIntro.md b/2019/2019-09-24_advancedGitTraining/slides/rebase-iIntro.md
deleted file mode 100644
index 6616993802bd0b2137dc8ed080e7b98b9f006f35..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebase-iIntro.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Theory: Git Interactive Rebasing
-
-```bash
-git rebase -i <branch>
-```
-
-* Enables more precise control over the rebased commits
-* Before committing many actions are at disposal
-
-```bash
-# p, pick = use commit
-# r, reword = use commit, but edit the commit message
-# e, edit = use commit, but stop for amending
-# s, squash = use commit, but meld into previous commit
-# f, fixup = like "squash", but discard this commit's log message
-# x, exec = run command (the rest of the line) using shell
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation1.md
deleted file mode 100644
index 5b39ba0b9b3751202e27f44c01de47236bab06ed..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation1.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Practical: Git Interactive Rebasing
-
-* Create and switch to your own branch
-* Add and commit two files to this branch:
-
-```bash
-$ echo "# Michael" > Michael.md
-$ git add Michael.md
-$ git commit -m "Add Michael to the list of attendees"
-$ git push origin yourBranch
-
-$ echo "# Kevin" > Kevin.md
-$ git add Kevin.md
-$ git commit -m "Add Kevin to the list of attendees"
-$ git push origin yourBranch
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation2.md b/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation2.md
deleted file mode 100644
index bbd369a8b33fd585c05e11857b31fc5078abe909..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation2.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Practical: Git Interactive Rebasing
-
-* Perform an interactive rebase with the two last commits:
-
-```bash
-$ git rebase -i HEAD~2
-```
-
-* reword the first commit's message to:
-`These are the two squashed commits`
-* combine the second and first commit into one,
-omitting the second's commit message.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation3.md b/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation3.md
deleted file mode 100644
index 777f04282eac562798802cd6d621f82dfe8a2ed3..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation3.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Practical: Git Interactive Rebasing
-
-The prompt shows up:
-```bash
-$ pick 1234567 add Micheal to attendee list
-$ pick abcdef0 add Kevin to attendee list
-```
-
-The keywords should be changed to:
-```bash
-$ reword 1234567 add Micheal to attendee list
-$ fixup abcdef0 add Kevin to attendee list
-```
-
-Upon confirming, change the message of commit 1234567:
-```bash
-$ Add Micheal and Kevin to the attendee list
-```
-
-Then use force-push to push your changes:
-```bash
-$ git push origin myBranch -f
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation4.md b/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation4.md
deleted file mode 100644
index 5a8a163051f025adfea8fcae4d7a601c6ab5bdef..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation4.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Practical: Git Interactive Rebasing
-
-* If you wanted to keep both commit messages in one commit, instead change the prompts to squashing instead
-```bash
-$ pick 1234567 add Micheal to attendee list
-$ squash abcdef0 add Kevin to attendee list
-```
-
-* This will create a commit with both files still in, but the commit message of that commit will be the two commit messages of the two files combined.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebase.md b/2019/2019-09-24_advancedGitTraining/slides/rebase.md
new file mode 100644
index 0000000000000000000000000000000000000000..faa0439057e081dbaf2b39001268422a8638e4ee
--- /dev/null
+++ b/2019/2019-09-24_advancedGitTraining/slides/rebase.md
@@ -0,0 +1,149 @@
+# Theory: Git Rebasing
+
+* Git rebase enables to keep up with changes made to a branch
+* Straightens the workflow
+* Avoid discrepancies when multiple people work on the same project
+
+Imagine the following situation:
+<div style="top: 10em; left: 30%; position: absolute;">
+ <img src="slides/img/beforeRebase.png" height="400px">
+</div>
+
+
+
+# Theory: Git Rebasing
+
+* Develop branch is several commits ahead of master.
+* Commits implemented into master that aren't in develop.
+
+<div style="top: 10em; left: 30%; position: absolute;">
+ <img src="slides/img/afterRebase.png" height="400px">
+</div>
+
+
+
+# Practical: Git Rebasing
+
+* Create a file in your branch
+```bash
+$ git checkout myBranch
+$ echo "# message" > yourName.md
+```
+
+* Then create a file in the develop branch
+```bash
+$ git checkout develop
+$ touch startRebase.txt
+```
+
+* Check the histories of both branches
+```bash
+$ git log
+```
+
+
+
+# Practical: Git Rebasing
+
+* rebase the develop branch onto your branch
+```bash
+$ git checkout myBranch
+$ git rebase develop
+```
+
+* check the history of your branch again
+```bash
+$ git log
+```
+
+
+
+# Theory: Git Interactive Rebasing
+
+```bash
+git rebase -i <branch>
+```
+
+* Enables more precise control over the rebased commits
+* Before committing many actions are at disposal
+
+```bash
+# p, pick = use commit
+# r, reword = use commit, but edit the commit message
+# e, edit = use commit, but stop for amending
+# s, squash = use commit, but meld into previous commit
+# f, fixup = like "squash", but discard this commit's log message
+# x, exec = run command (the rest of the line) using shell
+```
+
+
+
+# Practical: Git Interactive Rebasing
+
+* Create and switch to your own branch
+* Add and commit two files to this branch:
+
+```bash
+$ echo "# Michael" > Michael.md
+$ git add Michael.md
+$ git commit -m "Add Michael to the list of attendees"
+$ git push origin yourBranch
+
+$ echo "# Kevin" > Kevin.md
+$ git add Kevin.md
+$ git commit -m "Add Kevin to the list of attendees"
+$ git push origin yourBranch
+```
+
+
+
+# Practical: Git Interactive Rebasing
+
+* Perform an interactive rebase with the two last commits:
+
+```bash
+$ git rebase -i HEAD~2
+```
+
+* reword the first commit's message to:
+`These are the two squashed commits`
+* combine the second and first commit into one,
+omitting the second's commit message.
+
+
+
+# Practical: Git Interactive Rebasing
+
+The prompt shows up:
+```bash
+$ pick 1234567 add Micheal to attendee list
+$ pick abcdef0 add Kevin to attendee list
+```
+
+The keywords should be changed to:
+```bash
+$ reword 1234567 add Micheal to attendee list
+$ fixup abcdef0 add Kevin to attendee list
+```
+
+Upon confirming, change the message of commit 1234567:
+```bash
+$ Add Micheal and Kevin to the attendee list
+```
+
+Then use force-push to push your changes:
+```bash
+$ git push origin myBranch -f
+```
+
+
+
+# Practical: Git Interactive Rebasing
+
+* If you wanted to keep both commit messages in one commit, instead change the prompts to squashing instead
+```bash
+$ pick 1234567 add Micheal to attendee list
+$ squash abcdef0 add Kevin to attendee list
+```
+
+* This will create a commit with both files still in, but the commit message of that commit will be the two commit messages of the two files combined.
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebaseIntro.md b/2019/2019-09-24_advancedGitTraining/slides/rebaseIntro.md
deleted file mode 100644
index 343f11f378e40ca8ffae163d7989bff1c61c3f33..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebaseIntro.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Theory: Git Rebasing
-
-* Git rebase enables to keep up with changes made to a branch
-* Straightens the workflow
-* Avoid discrepancies when multiple people work on the same project
-
-Imagine the following situation:
-<div style="top: 10em; left: 30%; position: absolute;">
- <img src="slides/img/beforeRebase.png" height="400px">
-</div>
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebaseIntro2.md b/2019/2019-09-24_advancedGitTraining/slides/rebaseIntro2.md
deleted file mode 100644
index 4ada0e92ca662cf348fdbcbc1f5b0e78b81655c0..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebaseIntro2.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Theory: Git Rebasing
-
-* Develop branch is several commits ahead of master.
-* Commits implemented into master that aren't in develop.
-
-<div style="top: 10em; left: 30%; position: absolute;">
- <img src="slides/img/afterRebase.png" height="400px">
-</div>
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebasePresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/rebasePresentation1.md
deleted file mode 100644
index c2cb343325f345e758339134093b826a94788668..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebasePresentation1.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Practical: Git Rebasing
-
-* Create a file in your branch
-```bash
-$ git checkout myBranch
-$ echo "# message" > yourName.md
-```
-
-* Then create a file in the develop branch
-```bash
-$ git checkout develop
-$ touch startRebase.txt
-```
-
-* Check the histories of both branches
-```bash
-$ git log
-```
diff --git a/2019/2019-09-24_advancedGitTraining/slides/rebasePresentation2.md b/2019/2019-09-24_advancedGitTraining/slides/rebasePresentation2.md
deleted file mode 100644
index 25c1687edf9fade70a07bbbe45d6e6e2b42d18c3..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/rebasePresentation2.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Practical: Git Rebasing
-
-* rebase the develop branch onto your branch
-```bash
-$ git checkout myBranch
-$ git rebase develop
-```
-
-* check the history of your branch again
-```bash
-$ git log
-```
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/resetPresentation.md b/2019/2019-09-24_advancedGitTraining/slides/reset.md
similarity index 80%
rename from 2019/2019-09-24_advancedGitTraining/slides/resetPresentation.md
rename to 2019/2019-09-24_advancedGitTraining/slides/reset.md
index 0a358b62dae88fc7509c78d2956538eb4babb545..41b6837783fc283abf334c303817b5d22f47a5c9 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/resetPresentation.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/reset.md
@@ -1,3 +1,10 @@
+# Theory: Git Reset
+
+* Enables to reset back to a previous commit HEAD
+* Discards ALL commits made after the selected commit HEAD
+
+
+
# Practical: Git Reset
* Start by committing two files:
@@ -10,7 +17,7 @@ $ git commit -m "Reset here"
$ echo "This file contains faulty code" > undo.txt
$ git add undo.txt
$ git commit -m "Undo this commit"
-```
+```
* Check the commits again and copy the relevant commit header:
```bash
$ git log
diff --git a/2019/2019-09-24_advancedGitTraining/slides/resetIntro.md b/2019/2019-09-24_advancedGitTraining/slides/resetIntro.md
deleted file mode 100644
index e9b050691b6e709cf7554ed301587195a761b9ec..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/resetIntro.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Theory: Git Reset
-
-* Enables to reset back to a previous commit HEAD
-* Discards ALL commits made after the selected commit HEAD
\ No newline at end of file
diff --git a/2019/2019-09-24_advancedGitTraining/slides/revertPresentation.md b/2019/2019-09-24_advancedGitTraining/slides/revert.md
similarity index 83%
rename from 2019/2019-09-24_advancedGitTraining/slides/revertPresentation.md
rename to 2019/2019-09-24_advancedGitTraining/slides/revert.md
index 7c5d40ce3df750f2008a761d396860ca0712bef0..d0449433e5de23b39a0a0c6cde7c5baa18576779 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/revertPresentation.md
+++ b/2019/2019-09-24_advancedGitTraining/slides/revert.md
@@ -1,3 +1,9 @@
+# Theory: Git Revert
+
+* Enables the deletion of committed commits
+
+
+
# Practical: Git Revert
* On your branch, create and commit a file:
diff --git a/2019/2019-09-24_advancedGitTraining/slides/revertIntro.md b/2019/2019-09-24_advancedGitTraining/slides/revertIntro.md
deleted file mode 100644
index 015ae5aeda4d3a498d2529b154c3fa16a138fb07..0000000000000000000000000000000000000000
--- a/2019/2019-09-24_advancedGitTraining/slides/revertIntro.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Theory: Git Revert
-
-* Enables the deletion of committed commits
\ No newline at end of file
diff --git a/theme b/theme
index 8707a9fed879305912562de34691b1e51b910852..3f950f06b72824f97b486a47d54754eeed0f0faf 160000
--- a/theme
+++ b/theme
@@ -1 +1 @@
-Subproject commit 8707a9fed879305912562de34691b1e51b910852
+Subproject commit 3f950f06b72824f97b486a47d54754eeed0f0faf