Resolve All Merge Conflicts

You can choose one branch as the source of truth to resolve all merge conflicts in the selected file.

See Understand How to Resolve Conflicts.

The Branch panes highlight the conflicts between Branch A and Branch B.

• Branch A - This pane highlights the conflicting code in the Their branch, which is the source branch or the branch you're merging from.
• Branch B - This pane highlights the conflicting code in the Ours branch, which is the target branch or the branch you're merging into.

Note:

You can't resolve all conflicts by clicking the Output pane's A or B button and then clicking the Resolve All button.

Resolving merge conflicts doesn't fix inconsistencies in your semantic model. You must run the consistency check to detect and fix inconsistencies in your semantic model.

1. On your home page, click Navigator and then click Semantic Models.
2. In the Semantic Models page, click a semantic model to open it.
3. Click Toggle Git Panel to open the Git pane.
4. Click the Merge tab and go to the Merge Conflicts pane.
5. Right-click a file and select View Conflicts.
6. In the Branch panes, click the Take All button corresponding to the branch that you want to use to resolve all merge conflicts in the file.
7. In the Output pane, click Resolve All.
8. Go to the Merge Conflicts pane and confirm that the file that contained the conflicts was removed from the list.
9. In the Merge tab, click Merge.