h44z/uibk_703807-Advanced-CXX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assignment 1: Clarify conflict conditions

Browse Source
This commit is contained in:
Alex Hirsch 2020-11-09 23:32:43 +01:00
parent 45a81d8927
commit 5b442bbd74
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assignment1/README.md
View File

@ -104,8 +104,9 @@ You can add new branches by first checking out a previous commit, and then creat
This command initiates a merge with the currently checked out commit and the specified commit. This command initiates a merge with the currently checked out commit and the specified commit.
A merge is only initiated if there are no un-committed changes. A merge is only initiated if there are no un-committed changes.
Auto-merging files that have been touched in both branches is not supported. Auto-merging files that have been modified in both branches is not supported.
If a file has been modified in both branches, the whole file is treated as a conflict. If a file has been modified (or created) in both branches, the whole file is treated as a conflict.
If a file has been deleted in both branches you may treat it as no conflict.
If a conflict is encountered, stop the merge process and provide the respective files of the other branch as well as the common base. If a conflict is encountered, stop the merge process and provide the respective files of the other branch as well as the common base.