diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md index ec8b72da90c931794eba9401d5c61aacfc244e1c..baeb3790aa5096f07c80937e31ee3363608806c1 100644 --- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation1.md @@ -7,7 +7,7 @@ $ git checkout develop $ git checkout -b changeMichael ``` -Change Michael file... +Change Michael file... ```bash $ git fetch upstream diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md index 63bff91d93521d34f67eac3d08b95cd0563cc1b0..9977864539b71d208631e49665741b898ff4a951 100644 --- a/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/conflictPresentation2.md @@ -11,6 +11,6 @@ A conflict should emerge $ git mergetool ``` -* This opens kdiff3 if it was properly set up. Selecting A will keep the changes of the target branch, +* This opens kdiff3 if it was properly set up. 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.