description of Merge Resolver window

This screenshot displays the Merge Resolver in the Designer that you use to resolve conflicts that might occur when merging branches. The Navigator pane in the Merge Resolver has a Conflicts section that lists all files where a conflict occurred, and an All Changes section that lists all the files that will be merged.

The editor tab in the Merge resolver displays the conflicts in the page selected in the Navigator. For each conflict in the file you can choose to keep the original version of the code, to use your version of the code, or to include both versions of the changes in the file.