create conflictPres2

2019/2019-09-09_testCourseAdv/slides/conflictPresentation.md → 2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md

@@ -4,4 +4,6 @@
 
 * Meanwhile a coworker changed that Micheal file in the develop branch
 
-* If you try to push your changes to that file into develop, you'll encounter a merge conflict, the system cannot know which change is now the one to keep.
+* If you try to push your changes to that file into develop, you'll encounter a merge conflict, the system cannot know which change is now the one to keep.
\ No newline at end of file
+
+* Usually done using `git diff` in bigger project this method quickly loses oversight
\ No newline at end of file

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

+# Practical: Conflict resolution using kdiff3
+
+* When prompted with the merge conflict, open kdiff3 to check the affected files
+
+* 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.
+
+* We are only interested in your changes, so select B and save
\ No newline at end of file