Understand How to Resolve Conflicts

This topic explains how to use the Merge editor's buttons to resolve a file's merge conflicts one at a time or all at the same time.

See About the Merge Editor.

Resolve an Individual Conflict

In the Output pane, use the A and B buttons to specify how to resolve merge conflicts one at a time.

Confirm that the button corresponding to the branch that you want to use to resolve the conflict is highlighted. By default both A and B are selected, so to select A, you must deselect B.

After you set the A and B buttons to indicate how to resolve the conflict, click the Resolve Item button to resolve the issue and navigate to the next conflict.

Reorder a Code Change to Resolve an Individual Conflict

In the Output pane, use the A and B buttons to reorder a code change to resolve a conflict.

Select a sequence for a conflict where you need to reorder (or stack) a code change. To specify a sequence, click the A button and then the B button to deselect them. Then click the buttons in either the A before B (so A's code before B's code) or B before A (so B's code before A's code) sequence to specify how to stack the changes. Then click the Resolve Item button to resolve the issue and navigate to the next conflict.

Resolve All Conflicts at the Same Time

Note:

You can't use the Resolve All button with the Output pane's A and B buttons to resolve all conflicts at the same time.

In the Branch pane, click the Take All button for the A (Ours) or B (Theirs) branch that you want to use as the single source of truth to resolve all conflicts, and then click Resolve All.

Mark Individual Conflicts and then Resolve All Conflicts as Marked

In the Output pane, use the Conflict up and down buttons to navigate to each highlighted conflict and use the A and B buttons to specify how to resolve each highlighted conflict. After you've specified how to resolve each item, click Resolve All to resolve all conflicts.