From cdba2c73be568b2b94a5ac94f3b9fceac5318f49 Mon Sep 17 00:00:00 2001
From: laurentheirendt <laurent.heirendt@uni.lu>
Date: Thu, 19 Sep 2019 16:18:10 +0200
Subject: [PATCH] simplifications of slides
---
.../slides/amendPresentation.md | 52 +++++++
.../slides/amendPresentation1.md | 13 --
.../slides/amendPresentation2.md | 16 ---
.../slides/amendPresentation3.md | 19 ---
.../slides/conflictPresentation.md | 64 +++++++++
.../slides/conflictPresentation1.md | 27 ----
.../slides/conflictPresentation2.md | 16 ---
.../slides/conflictPresentation3.md | 16 ---
.../slides/list.json | 136 ++++--------------
9 files changed, 147 insertions(+), 212 deletions(-)
create mode 100644 2019/2019-09-24_advancedGitTraining/slides/amendPresentation.md
delete mode 100644 2019/2019-09-24_advancedGitTraining/slides/amendPresentation1.md
delete mode 100644 2019/2019-09-24_advancedGitTraining/slides/amendPresentation2.md
delete mode 100644 2019/2019-09-24_advancedGitTraining/slides/amendPresentation3.md
create mode 100644 2019/2019-09-24_advancedGitTraining/slides/conflictPresentation.md
delete mode 100644 2019/2019-09-24_advancedGitTraining/slides/conflictPresentation1.md
delete mode 100644 2019/2019-09-24_advancedGitTraining/slides/conflictPresentation2.md
delete mode 100644 2019/2019-09-24_advancedGitTraining/slides/conflictPresentation3.md
diff --git a/2019/2019-09-24_advancedGitTraining/slides/amendPresentation.md b/2019/2019-09-24_advancedGitTraining/slides/amendPresentation.md
new file mode 100644
index 00000000..b30a7235
--- /dev/null
+++ b/2019/2019-09-24_advancedGitTraining/slides/amendPresentation.md
@@ -0,0 +1,52 @@
+# 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/amendPresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/amendPresentation1.md
deleted file mode 100644
index 3875c453..00000000
--- 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 53d82aba..00000000
--- 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 bae91bc9..00000000
--- 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/conflictPresentation.md b/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation.md
new file mode 100644
index 00000000..792de90b
--- /dev/null
+++ b/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation.md
@@ -0,0 +1,64 @@
+# 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/conflictPresentation1.md b/2019/2019-09-24_advancedGitTraining/slides/conflictPresentation1.md
deleted file mode 100644
index baeb3790..00000000
--- 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 99778645..00000000
--- 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 93df0456..00000000
--- 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/list.json b/2019/2019-09-24_advancedGitTraining/slides/list.json
index 7b595805..cefd0a51 100644
--- a/2019/2019-09-24_advancedGitTraining/slides/list.json
+++ b/2019/2019-09-24_advancedGitTraining/slides/list.json
@@ -1,107 +1,33 @@
[
- {
- "filename": "index.md",
- },
- {
- "filename": "overview.md",
- },
- {
- "filename": "gettingStarted.md",
- },
- {
- "filename": "rebaseIntro.md",
- },
- {
- "filename": "rebaseIntro2.md",
- },
- {
- "filename": "rebasePresentation1.md",
- },
- {
- "filename": "rebasePresentation2.md",
- },
- {
- "filename": "rebase-iIntro.md",
- },
- {
- "filename": "rebase-iPresentation1.md",
- },
- {
- "filename": "rebase-iPresentation2.md",
- },
- {
- "filename": "rebase-iPresentation3.md",
- },
- {
- "filename": "rebase-iPresentation4.md",
- },
- {
- "filename": "chPickIntro.md",
- },
- {
- "filename": "chPickPresentation1.md",
- },
- {
- "filename": "chPickPresentation2.md",
- },
- {
- "filename": "revertIntro.md",
- },
- {
- "filename": "revertPresentation.md",
- },
- {
- "filename": "resetIntro.md",
- },
- {
- "filename": "resetPresentation.md",
- },
- {
- "filename": "amendIntro.md",
- },
- {
- "filename": "amendPresentation1.md",
- },
- {
- "filename": "amendPresentation2.md",
- },
- {
- "filename": "amendPresentation3.md",
- },
- {
- "filename": "headRebase-iIntro.md",
- },
- {
- "filename": "headRebase-iPresentation.md",
- },
- {
- "filename": "mergeIntro.md",
- },
- {
- "filename": "mergePresentation1.md",
- },
- {
- "filename": "mergePresentation2.md",
- },
- {
- "filename": "conflictIntro.md",
- },
- {
- "filename": "kdiff3Install1.md",
- },
- {
- "filename": "kdiff3Install2.md",
- },
- {
- "filename": "conflictPresentation1.md",
- },
- {
- "filename": "conflictPresentation2.md",
- },
- {
- "filename": "conflictPresentation3.md",
- },
- {
- "filename": "thanks.md",
- }
+ { "filename": "index.md" },
+ { "filename": "overview.md" },
+ { "filename": "gettingStarted.md" },
+ { "filename": "rebaseIntro.md" },
+ { "filename": "rebaseIntro2.md" },
+ { "filename": "rebasePresentation1.md" },
+ { "filename": "rebasePresentation2.md" },
+ { "filename": "rebase-iIntro.md" },
+ { "filename": "rebase-iPresentation1.md" },
+ { "filename": "rebase-iPresentation2.md" },
+ { "filename": "rebase-iPresentation3.md" },
+ { "filename": "rebase-iPresentation4.md" },
+ { "filename": "chPickIntro.md" },
+ { "filename": "chPickPresentation1.md" },
+ { "filename": "chPickPresentation2.md" },
+ { "filename": "revertIntro.md" },
+ { "filename": "revertPresentation.md" },
+ { "filename": "resetIntro.md" },
+ { "filename": "resetPresentation.md" },
+ { "filename": "amendIntro.md" },
+ { "filename": "amendPresentation.md" },
+ { "filename": "headRebase-iIntro.md" },
+ { "filename": "headRebase-iPresentation.md" },
+ { "filename": "mergeIntro.md" },
+ { "filename": "mergePresentation1.md" },
+ { "filename": "mergePresentation2.md" },
+ { "filename": "conflictIntro.md" },
+ { "filename": "kdiff3Install1.md" },
+ { "filename": "kdiff3Install2.md" },
+ { "filename": "conflictPresentation.md" },
+ { "filename": "thanks.md" }
]
--
GitLab