diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md index 0da1b19cb069c72509d2d6d0d2192a6541737699..de838c8004cb42777e947e833a64408d61072b6d 100644 --- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md @@ -4,6 +4,7 @@ * 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. * Usually done using `git diff` in bigger project this method quickly loses oversight \ No newline at end of file