Task 2: Merging the branches

You merge two branches to synchronize their rules, and then you check your changes by using a snapshot.

About this task

You use the merge feature to add changes from the Increase Minimum branch to the My Tutorial branch.

Step 1: Selecting the branches

You select the branches to be merged.

Procedure

  1. In the Increase Minimum branch, click the Merge Branches button "", and then expand main in the dialog box to see the following list:
    Image shows the merge tree directory.
  2. Click My Tutorial to select the branch. Select Lock branches before merge selected to prevent other users from making changes to the branches while you merge them.
  3. Click Merge.
    The merge page opens. It shows the selected branches in a table, and options for merging the branches:
    Image shows the merge page.

Step 2: Merging the rules

You compare the rules, select the options for updating the branches, and merge the branches.

Procedure

  1. Click Expand all to see all the artifacts in the table:
    Images shows the rules in the merge table.
  2. Hover over the row for the minimum credit score rule, and click the Compare button "".
    The comparison page shows the rule in the two branches, and highlights the differences:
    Image shows the comparison page.
  3. Close the comparison page, and do the same comparison operation for repayment and score and maximum amount to see the differences between the branches.
  4. After you compare the rules, return to the minimum credit score row, and click update in My Tutorial.

    A menu opens with three update options:

    Image shows the update options.
  5. Set the merge options for the rules as follows:
    • minimum credit score: update in My Tutorial (The changes in the Increase Minimum rule are made in the same rule in My Tutorial.)
    • repayment and score: update in Increase Minimum (The changes in the Increase Minimum table are replaced with variables in the same table in My Tutorial.)
    • maximum amount: do not modify (No changes are made between the branches.)
  6. Click the Apply Merge button "" at the top of the table.
  7. Enter the following comment, and select Create snapshots of the branches before merging:

    Merged changes between branches.

  8. Click Apply Merge. When the operation finishes, the merge table shows the following message:
    Merge completed successfully
  9. Click Expand All. The table shows the following information:
    Image shows the status of the rules.

    The minimum credit score rule was updated in the My Tutorial branch, and the repayment and score decision table was updated in the Increase Minimum branch. The table does not show the maximum amount rule because no update was made to the rule in either branch.

Step 3: Checking the merge results

You compare the My Tutorial branch to its snapshot to see what was changed by the merge operation.

Procedure

  1. Click Miniloan Service in the breadcrumbs to return to the Branches tab.
  2. Expand main, and click My Tutorial to open the branch.
  3. Open the Snapshots tab, and click Before merge from 'Increase Minimum' to open the snapshot.
  4. Click the Compare button "".
    The following list opens:
    Image shows the list of comparison items.
  5. Click Compare. A page opens with the results of the comparison. It contains a table that shows the modified rule:
    Table shows the modified rule.
  6. Hover over the minimum credit score row, and click the Compare button "".
    The comparison window opens, and shows the same results that are in step 2.2:
    Image shows the snapshot comparison.

Results

You have completed the tutorial. You created a branch, updated the new branch, and merged your changes into another branch. Then, you compared the second branch to a snapshot to check the merged changes.

Deleting the decision service from Decision Center

If you plan to do another Business console tutorial, you can return the decision service to its original state by using the Initial State snapshot. However, if you no longer need the Miniloan Service decision service in the Business console, remove it from Decision Center. Removing your project prevents it from conflicting with other tutorial projects. To delete the decision service, see Preparing and removing the tutorial project.