Conflicts and warnings in the Merge Branches wizard

The Conflicts and Warnings window displays an expandable list of rules that the Merge Branches wizard has identified as having conflicts, warnings, or both. To open this window, click the displayed number of conflicts and warnings on the main wizard screen.

Note: The displayed report of conflicts and warnings depends on the target ruleset version selected for the merge. For example, merging a rule into target ruleset version 01-01-01 might display no conflicts and one warning, while merging that rule into target ruleset version 01-01-02 might display one conflict and no warnings. You must select the target ruleset version for the merge to get an accurate report of the potential conflicts and warnings.

When there are resolved conflicts, the report refreshes to indicate how many are resolved.