create conflictPres3

2019/2019-09-09_testCourseAdv/slides/conflictPresentation3.md

+# 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

2019/2019-09-09_testCourseAdv/slides/list.json

@@ -164,6 +164,11 @@
         "attr": {
         }
     },
+    {
+        "filename": "conflictPresentation3.md",
+        "attr": {
+        }
+    },
     {
         "filename": "thanks.md",
         "attr": {