Resolving conflicts in the Merge Branches wizard
To resolve the conflicts for a rule, complete the following steps:
Examine the conflicts reported for the rule in the Conflicts and Warnings window.
Click Compare next to the first conflict to examine the differences between your branch copy of the rule and the one in the base ruleset. Alternatively, click the ruleset name to open the base rule and directly examine it.
Review and resolve all of the differences between the base rule and your branch rule.
- If the changes are minor (such as a typo), open your branch rule and apply the same changes to it so that it matches the base rule.
- If the changes are more complex, or if they conflict with the choices or logic in your branch rule, contact the individual who modified the base rule and negotiate what the final set of changes should be and the testing procedure for testing them. After reaching a mutual decision, make the agreed-upon changes in your branch rule and test.
When changes to your branch rule are completed and tested, select the Mark as Resolved check box to indicate you have resolved the conflict.
After all conflicts reported in the Conflicts and Warnings window are marked resolved, you can click OK to close the window and return to the Merge Branches wizard to continue with the merge process.
In the main screen of the wizard, you can see if all conflicts are resolved by verifying if the number of Resolved conflicts matches the number of reported conflicts for all of the branch rulesets.