Merging branches with the Merge Branches wizard

After development in a branch has reached a stable state, use the Merge Branches wizard to move the branch's contents into the base rulesets. The Merge Branches wizard helps identify potential conflicts so that you can address them before moving your changes.

For more information about working with branches and branch rulesets, see Merging branches.

To begin merging a branch:

1. Use the best practices described in Best practices for merging branches.
2. Open the application rule for your development application that contains the branch. (See branches and branch rulesets for a description of a development application in a branch development environment.)
3. Complete one of the following actions:
   • To merge one or more branches, on the Definition tab, in the Branch list, click Merge Branches. Select the branches you want to merge and click OK. You can select all branches by clicking Select All or deselect all branches by clicking Deselect All.
   • To merge a single branch, on the Definition tab, in the Branch list, click Actions next to the branch, and then select Merge. Before merging, a snapshot of the base rule is created. This snapshot can be used as a restore point. To access the snapshot of the base rule, open the merge history of the merged rule.
     
     The Merge Branches wizard opens in a new tab in the Designer Studio. Refer to Parts of the Merge Branches wizard for information about the fields and controls in this wizard.

Related information

Open topic with navigation