diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json index f274e52f622805385eda002bb73c2b3d6c7277b9..d2c7dfbc9cd7929abe5142135d8469dc678b6739 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 0000000000000000000000000000000000000000..5683ccf3ff0f05ff203fc1befda0e7f4a9b74d29 --- /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