Merging branches

You merge branches to combine changes from one branch into another.

Before you begin

Share or revert any unshared changes on your current branch before you can start a merge.

About this task

Before you begin the merge process, you can use merge requests to notify collaborators that a branch is ready. To create a merge request, click the Start merge request icon Merge request icon next to the branch name.

The merging process consists of the following steps:
  1. Select the branch that you want to merge into the current branch.
  2. Preview the changes that you are going to integrate into the current branch.
  3. Select the changes to apply to the current branch if there are merge conflicts. Merge conflicts may arise when the two branches that you want to merge have competing changes.
  4. Share your changes with your collaborators to finalize the merge process.

Procedure

  1. Open the Branches tab from your decision automation page.
  2. Click the Merge branch into icon Merge branch icon next to name of branch you want to merge into the current branch.
  3. If there are no merge conflicts, review the changes between the two branches and click Apply changes.
    If there are merge conflicts, resolve them before you apply the changes:
    1. Click the arrow next to the name of your decision service to see all conflicting changes and complete the two following steps for each conflict.
    2. Click View details to review the differences.
    3. Close the differences viewer and click Select version to choose the version that you want to keep.
      Warning: Changes from the version that you do not select will be lost
    4. When all conflicts are resolved, click Apply changes.
  4. The Share changes tab automatically opens. The merged changes are loaded in your decision automation and ready for review.
    Before you finalize the merge, you can verify your changes:
    • Go back to your decision service to run your models and confirm everything works as expected.
    • Make any necessary adjustments to your decision service.
    • To return to the Share changes tab at any time, click View changes in the top banner.

    When you are ready, choose one of the following options:

    Option Steps
    Finalize the merge Click Finalize merge in the Share changes tab. Optionally, enter a comment to describe your changes, then click Share.

    Your changes become available to your collaborators and the merge operation is recorded in the View history tab.
    Revert the merge Click Cancel merge in the Share changes tab.