LinkedIn
Copied!

Table of Contents

Merging branches into target rulesets

Version:

Only available versions of this content are shown in the dropdown

After teams have completed rule development in a branch, you can use the Merge Branches wizard to move the contents of the branch into the base ruleset of the development application.

As a best practice, the system administrator should create a new ruleset version for the base ruleset, independent of the wizard. Individual teams should develop rules in their specific branches and then merge those branches into the existing base ruleset version that was created by the administrator. This process gives administrators better control over versions.

  1. Check all rules into their base rulesets before you merge them.

  2. Optional:

    Check if there are any potential conflicts to address before merging branches. For more information, see Viewing branch information.

  3. Optional:

    As a best practice, lock a branch after development is complete so that no more changes can be made. For more information, see Locking a branch.

  4. Optional:

    Check if there are any potential conflicts to address before merging branches. For more information, see Viewing branch information.

  5. In the navigation panel, click App, and then click Branches.

  6. Do one of the following actions:

    • To merge a single branch, right-click the branch and click Merge.
    • To merge multiple branche, right-click your application, click Merge, and select all the branche that you want to merge.
  7. If there are conflicts or warnings, the Target ruleset section displays a link that opens the Conflicts and Warnings window. You must resolve conflicts before you can merge branches. For more information, see Conflicts and warnings in the Merge Branches wizard.

  8. From the drop-down box next to the Target version section, select the base ruleset version into which rules are merged. Complete one of the following actions:

    • Select Create new version to create the new ruleset version in the base ruleset during the merge.
    • Select an existing base ruleset version in which you want to merge the rules.
  9. Click Merge. Details about the merge are displayed when the merge is completed, such as whether the merge was successful, how many rules were merged, and the source and target rulesets.

  • Conflicts and warnings in the Merge Branches wizard

    The Conflicts and Warnings window displays an expandable list of rules that the Merge Branches wizard has identified as having conflicts, warnings, or both. To open this window, click the displayed number of conflicts and warnings on the main wizard screen.

  • Merge branches customization

    You can enhance the merge process for your development team in various ways to comply with your organization's policies and procedures. You can:

Related Content

Have a question? Get answers now.

Visit the Collaboration Center to ask questions, engage in discussions, share ideas, and help others.