You are here: Designer Studio > Branch development and merging > Merge Branches wizard > Parts of the Merge Branches wizard

Parts of the Merge Branches wizard

The fields and controls in the main screen of the wizard are:

Field

Description

Source ruleset

Contains the following information.

  • Name of the branch ruleset.
  • Total candidates:Displays the number of to-be-merged rules in the branch ruleset. To see a list of the rules, click the displayed number.
  • Source checked out: Displays the number of rules checked out from the branch ruleset.
  • Note: You must check all rules into their branch ruleset before you can merge the branch ruleset. To see which rules are checked out and by whom, click the displayed number. In the report that opens, for each row, the Locked by column displays the operator ID for the user that has the rule checked out.

Target ruleset

Contains the following information.

  • Name of the base ruleset and ruleset version into which the rules in the branch ruleset will be merged. To open the base ruleset's rule form (to examine its ruleset versions or manage its passwords), click the displayed name.
  • Use the drop-down list next to the ruleset name to choose the base ruleset version into which the rules will be merged. Choices are:

    • Create New Version — Default. A best practice is to merge rules into a new ruleset version or the highest existing one if it is empty. When this choice is selected, the wizard creates a new ruleset version in the base ruleset during the merge process, using the next higher version number that is available in the base ruleset. In a field next to the drop-down list, the system displays a default description of the to-be-created ruleset version. The default description is a combination of the version number and the branch name. You can enter a new description in the field.
    • An existing base ruleset version (such as 01-01-01) — You can choose to merge rules into an existing ruleset version in the base ruleset. If the existing base ruleset version is locked, its password is required in the appropriate Number_of_passwords Password fields to merge rules into that ruleset version.

  • Number of conflicts, how many are resolved (if any), and number of warnings.
  • Note: You must resolve conflicts before you can merge branch rulesets.

    Click the link to open the Conflicts and Warnings window; see Conflicts and warnings in the Merge Branches wizard.

  • Target checked out:Displays the number of rules checked out from the base ruleset (the target destination for the to-be-merged rules).
  • Note: You must check in all rules into their base ruleset before you can merge the branch ruleset. To see which rules are checked out and by whom, click the displayed number. In the report that opens, for each row, the Locked by column displays the operator ID for the user that has the rule checked out.

Number_of_passwords Password

Displays the appropriate field for when you must supply a password.

  • Source version: Appears when the branch ruleset version is locked. Enter the password for the branch ruleset version so that its rules can be merged. The system does not change the protection set on the ruleset version.
  • Target add version: Appears when Create New Version is selected for the target, and the base ruleset (the target) is password-protected for adding a new ruleset version. (See RuleSet form — Completing the Security tab).
  • Enter the password for adding a ruleset version to the base ruleset, as specified by the To Add a RuleSet Version field on the Security tab of the base ruleset's rule form. The system does not change the protection set on the base ruleset. Entering the password here allows access to create the new ruleset version and save the to-be-merged rules into that ruleset version.

  • Target version: Appears when you are merging rules into an existing base ruleset version, and the selected ruleset version is password protected. (See RuleSet form — Completing the Versions tab).
  • Enter the password that locks the selected ruleset version, as specified for that ruleset version in the Versions tab of the base ruleset's rule form. The system does not change the protection set on that base ruleset version. Entering the password here allows access to save the to-be-merged rules into that locked ruleset version.

  • Target update version: Appears when you are merging rules into an existing base ruleset version, and the base ruleset (the target) is password-protected for updating a new ruleset version. (See RuleSet form — Completing the Security tab).
  • Enter the password for updating a ruleset version in the base ruleset, as specified by the To Update a RuleSet Version field on the Security tab of the base ruleset's rule form. The system does not change the protection set on the base ruleset. Entering the password here allows access to the selected ruleset version and save the to-be-merged rules into that ruleset version.

Lock target after merge

Optional. Appears if Create New Version is selected for the target. Enter a password for locking the ruleset version that will be created in the base ruleset (the target) by the merge process. At the end of the merge process, the system locks the new ruleset version using this password and saves it in the base ruleset.

A best practice is to enter a password to lock the new ruleset version after the merge.

Keep all source rule and rulesets after merge

Optional. Select to have the system retain all of the branch rulesets and the rules they contain after successfully merging the rules into the base rulesets. By default, the system removes the branch rulesets and their contained rules after a successful merge.

The system retains the branch itself in the application rule regardless of this check box setting. To remove the branch itself, open the application rule and delete it from the General tab; see Deleting a branch from the system .

Merge

When all identified conflicts have been resolved, click to start merging the rules from the branch rulesets into the selected targets. See Running the Merge Branches wizard: examples.

Cancel

Click to cancel the merging of the branch.

Related Topics IconRelated information