Resolving conflicts between branches (Git only)
About this task
In a collaborative environment where multiple users work on the same project simultaneously, you may encounter conflicts when pushing, updating or merging branches. In this case, you will see a dialog box asking you whether to resolve the conflicts.
To resolve the conflicts, do the following:
Procedure
-
Click OK in the dialog box
to open the Git Merge perspective.
The Git Merge perspective opens, and the Conflicts Navigator panel on the left displays the project items on which conflicts have been found. -
In the Conflicts
Navigator panel, right-click a conflicted item and select from
the context menu:
-
Resolve in editor: to open a compare editor in the right-hand panel of the Git Merge perspective.
Note that this option is available only for project items mentioned in Resolving conflicts in compare editors.
-
Accept mine: to accept all the changes on the working branch to fix conflicts on the item without opening a compare editor.
-
Accept theirs: to accept all changes on the other branch to fix conflicts on the item without opening a compare editor.
-
Mark as resolved: to mark all conflicts on the item as resolved, leaving discrepancies between the branches.
-
-
When all conflicts are fixed and marked as resolved, click
Yes when the following dialog box
opens, or the
icon on the top of the Conflicts Navigator panel to continue your previous
action.
