Merging branches

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

Before you begin

The merge process cannot be started if there are unshared changes on your current branch. You must share or revert them before you can start to merge changes.

About this task

The merging process consists of the following steps:
  • Select the branch that you want to merge into the current branch.
  • Preview the changes that you are going to integrate into the current branch.
  • Select the changes to apply to the current branch in case of merge conflict. Merge conflicts may arise when the two branches that you want to merge have competing changes.
  • Share your changes with your collaborators to finalize the merge process.

You can use merge requests to notify your collaborators that a branch is ready for merging. To create a merge request, click the Start merge request icon Merge request icon next to the name of the branch that is ready for merging.

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 is no merge conflict, you can compare the changes between the two branches before clicking Apply changes.
    If there are merge conflicts, you must resolve them before you can merge:
    1. Click the arrow next to the name of your decision service to see all the conflicting changes. Complete the two following steps for each conflict.
    2. Click View details to open the differences viewer and review the changes.
    3. Close the differences viewer and click Select version and select the version that you want to keep.
      Warning: Changes from the version that you do not select will be lost
    4. When you are done resolving the merge conflicts, click Apply changes.
  4. The Share changes tab automatically opens.
    The merged changes are loaded and ready for review in your decision automation. The merge process will only be finalized after you share your changes. Before finalizing the merge, you can go back to your decision services to run your models and make sure everything still works as expected. If needed, you can make adjustments to your decision services. You can go back to the Share changes tab at any time by clicking View changes in the top banner.
    • If you are satisfied with the merged changes, click Finalize merge in the Share changes tab. You can enter a comment to describe the changes that you made. After you click Share, your changes become available to your collaborators and the merge operation is visible in the View history tab.
    • If you are not satisfied with the merged changes and want to revert them, click Cancel merge in the Share changes tab.