Examples of the Merge Branches wizard process

This topic provides examples of the branch merge process.

Simple merge process — No conflicts or warnings, merging a single branch into a new ruleset version, and locking that version after the merge:

1. For each branch ruleset, select Create New Version.
2. Enter a password in the Lock Target After Merge field.
3. Click Merge.

The system performs the merge and deletes the branch rules and branch rulesets. A confirmation message displays, and you can expand the sections for each branch ruleset to examine details about what was merged.

To see a list of the merged rules for a merged branch ruleset, and the status of merging each rule, click the Merged n of n link to open the Merge Results window.

Click Done to close the wizard.

Simple merge process — No conflicts or warnings, merging multiple new ruleset versions, and locking that version after the merge:

1. For each branch ruleset, select Create New Version.
2. Enter a password in the Lock target after merge field.
3. Click Merge.

The system performs the merge and deletes the branch rules and branch rulesets. The wizard displays a confirmation message and details about what was merged.

Simple merge process with conflicts — Merging a single branch into a new ruleset version, and locking that version after the merge:

1. For each branch ruleset, select Create New Version.
2. Enter a password in the Lock Target After Merge field.
3. For the first branch ruleset that has reported conflicts, click the conflicts notice to open the Conflicts and Notices window and resolve the conflicts.
4. Take the appropriate action to resolve each conflicting rule. Select the Conflict resolved. Merge this rule. check box for each rule you resolve.
5. In the Conflicts and Notices window, click OK to return to the main screen.
6. Repeat steps 3 and 4 for each branch ruleset that has reported conflicts.
7. Click Merge to merge the branch.

The system performs the merge and deletes the branch rules and branch rulesets. A confirmation message displays and you can expand the sections for each branch ruleset to examine details about what was merged.

Related information

Open topic with navigation