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.
When there are resolved conflicts, the report refreshes to indicate how many are resolved.
- Conflicts in the Merge Branches wizard
Before the wizard proceeds with the merge, you must indicate in this window that you have resolved all conflicts reported by the wizard. Conflicts occur for the following situations:
- Resolving conflicts in the Merge Branches wizard
To resolve the conflicts for a rule, complete the following steps:
- Addressing warnings in the Merge Branches wizard
Warnings are primarily informational and are provided to make you aware of how merging your branch might impact other teams or might not behave exactly as you think it will.