Resolve Individual Merge Conflicts

You can review and resolve each of the selected file's merge conflicts one at a time.

The Output pane displays and highlights the conflicting code side-by-side so that you can compare and select which code to use to resolve the conflict. The highlight colors correspond to branches A (Theirs) and B (Ours) displayed in the Branch panes.

For each conflict, use the A and B buttons to specify which branch's code you want to use to resolve the highlighted conflict. By default both buttons are selected, so to select A, you must deselect B. Or use the A and B buttons to specify the order (or stacking) of the code changes. See Understand How to Resolve Conflicts.

Resolving merge conflicts doesn't fix any 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 Navigator icon and then click Semantic Models.
  2. In the Semantic Models page, click a semantic model to open it.
  3. Click Toggle Git Panel Toggle Git panel open or close to open the Git pane.
  4. Click the Merge tab Merge Tab and go to the Merge Conflicts pane.
  5. Right-click a file and select View Conflicts.
  6. In the Output pane, locate the highlighted merge conflict.
  7. Use the A and B buttons to specify how to resolve the conflict. Click Resolve Item.
  8. Click Conflict Navigate Down to highlight the next merge conflict.
  9. Use the A and B buttons to specify how to resolve the conflict. Click Resolve Item.
  10. Navigate to each conflict and resolve it.
  11. After you've resolved all conflicts, go to the Merge Conflicts pane and confirm that the file that contained the conflicts was removed from the list.
  12. In the Merge tab, click Merge.