Task 2: Merging the branches

In this step, you select the branches to be merged.

1. In the Increase Minimum branch, click the Merge Branches button , and then expand main in the dialog box to see the following list:
   
2. Click Merged Changes 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:

   

In this step, you compare the rules, select the options for updating the branches, and merge the branches.

1. Click Expand all to see all the artifacts in the 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:

   

   Note: The version number of the rule in Increase Minimum is the version of the rule after you updated it.
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 Merged Changes.

   A menu opens with three update options:

   
5. Set the merge options for the rules as follows:
   • minimum credit score: update in Merged Changes (The changes in the Increase Minimum rule are made in the same rule in Merged Changes.)
   • repayment and score: update in Increase Minimum (The changes in the Increase Minimum table are replaced with variables in the same table in Merged Changes.)
   • 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:
   

   The minimum credit score rule was updated in the Merged Changes 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.

In this step, you compare the Merged Changes branch to its snapshot to see what was changed by the merge operation.

1. Click Miniloan Service in the breadcrumbs to return to the Branches tab.
2. Expand main, and click Merged Changes to open the branch.
3. Open the Snapshots tab, and click Before merge from 'Increase Minimum' to open the snapshot.
   The snapshot shows the branch before it was merged with Increase Minimum.
4. Click the Compare button at the top of the page.
   The following list opens:

   
5. Click Compare. A page opens with the results of the comparison. It contains a table that 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: