Related information
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:
Conflict situation |
Example of how this occurs |
| The rule in a lower base ruleset version has been recently updated. |
Base ruleset XYZ has two locked ruleset versions, 01-01-01 and 01-01-02. TeamA branches XYZ into their Story-A branch, and TeamB branches XYZ into their BugFix-1 branch. TeamB's work is a bug fix for version 01-01-01, and they complete their work and merge their BugFix-1 branch with the changed rules for base ruleset XYZ into 01-01-01. Then TeamA starts the wizard to merge their Story-A branch by creating a new version for base ruleset XYZ. The wizard reports a conflict because the rule was updated in ruleset version 01-01-01 (a lower version) by TeamB prior to TeamA's merge. |
| The rule in the selected target (base) ruleset version has been recently updated. |
Base ruleset XYZ has two locked ruleset versions, 01-01-01 and 01-01-02. TeamA branches XYZ into their Story-A branch, and TeamB branches XYZ into their Story-B branch. TeamB completes their work and merges their Story-B branch into 01-01-02. Then TeamA starts the wizard to merge their Story-A branch into 01-01-02 also. The wizard reports a conflict because the rule was updated in the same ruleset version 01-01-02 (TeamA's selected target version) by TeamB prior to TeamA's merge. |
| The same rule exists in multiple branches that are merged using the wizard to merge multiple branches. |
Base ruleset XYZ has one version, 01-01-01. TeamA has branches Story-A and Story-B, which have the same rule. Story-A is the topmost branch in the hierarchy. Story-A and Story-B are being merged using multibranch merge. The wizard reports a conflict for Story-A branch because Story-B has the same rule and will be merged before Story-A. To resolve this conflict, move all your changes for this rule from the Story-B branch to the rule in Story-A. |