Navigation and bulk resolution

Three-way Merge provides users with a way of sequentially viewing and resolving conflicts:

Figure 370: Navigating conflicts

• The Next/Previous conflict buttons allow you to navigate to the next or previous conflict or non-conflict difference

• The Next/Previous unresolved buttons allow you to navigate to the next or previous unresolved conflict

The comparison and merge output trees are synchronized, and the element in question is highlighted every time one of these buttons is pressed.

Note

Clicking on an element in the (top) comparison tree automatically scrolls the (bottom) merge output tree to the corresponding element or choice.

Alternatively, users may want to make a bulk choices for all conflicts in the current merge operation:

Figure 371: Bulk conflict resolution

Users can opt to merge in all changes from mine/base/theirs, for the following:

• All unresolved conflicts – this sets the chosen side as the chosen resolution side for all remaining unresolved conflicts (and only those).

• All conflicts – this makes the choice in favor of the selected side for all the conflicts and non-conflict differences, i.e. all choices are resolved automatically in favor of the chosen side.