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.

Warning situation Example of how this occurs Recommended steps
A rule with the same keys as the branch rule exists in a higher ruleset version in the target ruleset. You are merging the branch rule into target ruleset version 01-01-01, and the corresponding base rule also exists in target ruleset version 01-01-02.
  1. Click Compare next to the warning to examine the differences between your branch copy of the rule and the one in the other base ruleset version. Alternatively, click the ruleset name next to the caution icon to open the other rule and directly examine it.
  2. Review all differences between the rules, and use the Related Rules display to assess the impact of the differences.

    If the features in the rule in the higher ruleset version does not apply to your target ruleset version, and your changes in the lower target are not present in, or will not impact, the one in the higher ruleset version, it is likely safe to proceed with your merge. Merge into the lower ruleset version. The changes in the rule will work at that ruleset version level. Those applications that use the higher ruleset versions might not see your merged changes.

    For changes in your branch rule that you determine need to be ported to the rule in the higher ruleset version, define a new development application and matching branch using the higher ruleset version, and copy the base rule from the higher ruleset version into that branch ruleset. Make your changes in that branch, test, and merge to the higher ruleset version.
The corresponding base rule exists in another branch ruleset in the system. Another team has branched the same base ruleset that you are merging, and has a copy of the base rule in their branch ruleset.
  1. Click Compare next to the warning to examine the differences between your branch copy of the rule and the one in the other branch. Alternatively, click the ruleset name next to the caution icon to open the other rule and directly examine it.
  2. Review all differences between the rules, and use the Related Rules display to assess the impact of the differences.
  3. Contact the owner of the other branch, or the author of the other branched rule, and describe the changes you made to the rule in your branch and how they can test for the changes. Best practice is they would validate your changes after your merge your branch and they obtain your changes and include them in their branch.
  4. Complete the merge of your branch.
The corresponding base rule exists in another branch ruleset, which is branched from a different ruleset than your branch ruleset. In this situation, the rule exists in another branch ruleset which will later be merged into a different ruleset than the one the corresponding base rule is in. A team has branched a base ruleset that is different than the one you are merging, and has copied the base rule that corresponds to your branch rule into their branch ruleset.
  1. Click Compare next to the warning to examine the differences between your branch copy of the rule and the one in the other branch. Alternatively, click the ruleset name next to the caution icon to open the other rule and directly examine it.
  2. Review all differences between the rules, and use the Related Rules display to assess the impact of the differences.
  3. Contact the owner of the other branch, or the author of the other branched rule, and discuss why a rule with the same name exists in two different rulesets, and determine whether there are reasons for both to exist or whether one should be removed.
    • If the base rulesets are for different purposes and will not be run concurrently, then continue with your merge.
    • If the teams agree the rulesets are to be combined, negotiate an appropriate conclusion and perform agreed-upon changes. Depending on the outcome, complete your merge if appropriate.
A rule with the same keys has been updated somewhere else in the system. A rule exists in the system that has the same keys as the rule you are merging, and the other rule has been updated.
  1. Click Compare next to the warning to examine the differences between your branch copy of the rule and other rule. Alternatively, click the ruleset name next to the caution icon to open the other rule and directly examine it.
  2. Review all differences between the rules, and use the Related Rules display to assess the impact of the differences.
  3. Contact the owner of the other ruleset, or the author of the other rule, and discuss why a rule with the same name exists in two different rulesets, and determine whether there are reasons for both to exist or whether one should be removed.
    • If the base rulesets are for different purposes and will not be run concurrently, then continue with your merge.
    • If the teams agree the rulesets are to be combined, negotiate an appropriate conclusion and perform agreed-upon changes. Depending on the outcome, complete your merge if appropriate.