From 43f1097a43860dad93d1ad1bae27b17bcf320ad9 Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Fri, 6 Sep 2019 13:33:42 +0200
Subject: [PATCH] split mergePres into two slides
---
2019/2019-09-09_testCourseAdv/slides/list.json | 7 ++++++-
...{mergePresentation.md => mergePresentation1.md} | 0
.../slides/mergePresentation2.md | 14 ++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
rename 2019/2019-09-09_testCourseAdv/slides/{mergePresentation.md => mergePresentation1.md} (100%)
create mode 100644 2019/2019-09-09_testCourseAdv/slides/mergePresentation2.md
diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json
index f274e52f..d2c7dfbc 100644
--- a/2019/2019-09-09_testCourseAdv/slides/list.json
+++ b/2019/2019-09-09_testCourseAdv/slides/list.json
@@ -125,7 +125,12 @@
}
},
{
- "filename": "mergePresentation.md",
+ "filename": "mergePresentation1.md",
+ "attr": {
+ }
+ },
+ {
+ "filename": "mergePresentation2.md",
"attr": {
}
},
diff --git a/2019/2019-09-09_testCourseAdv/slides/mergePresentation.md b/2019/2019-09-09_testCourseAdv/slides/mergePresentation1.md
similarity index 100%
rename from 2019/2019-09-09_testCourseAdv/slides/mergePresentation.md
rename to 2019/2019-09-09_testCourseAdv/slides/mergePresentation1.md
diff --git a/2019/2019-09-09_testCourseAdv/slides/mergePresentation2.md b/2019/2019-09-09_testCourseAdv/slides/mergePresentation2.md
new file mode 100644
index 00000000..5683ccf3
--- /dev/null
+++ b/2019/2019-09-09_testCourseAdv/slides/mergePresentation2.md
@@ -0,0 +1,14 @@
+# 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
--
GitLab