Task 3: Merging branches

In this task you make changes to the main branch and merge the changes you made in Task 2 back into the main branch.

To merge branches:

1. To simulate the ongoing collaborative work, return to the main branch and edit a rule:
   1. On the Home tab, on the Branch in use menu, select main.
   2. Click the Explore tab, and then select the Loan Validation Determination project.
   3. In the eligibility folder, edit the rule checkIncome and set its Status property to Validated.
   4. Click Finish or Save.
2. Now that changes have been made in both branches, you want to merge these changes back into the main:
   1. On the Project tab, click Merge Branches.
   2. Select Spring Updates as the branch you want to merge with and click Next.

      The Enterprise console compares both branches, presents any differences in a table, and suggests an appropriate action to take.

      
      The proposed action to take is the bidirectional approach. The bidirectional approach is based on the assumption that you want to reflect changes made in either branch as follows:

      • If a new rule exists in one branch, you want to add it to the other branch.

      • If a rule has been deleted in one branch, you want to delete it from the other branch.

      • If a rule has been modified in one branch but not in the other, you want to update the unmodified one.

      • If a rule has been modified in both branches, no action is proposed, and you must specify what action to take.

   3. You decide that you do not want approval to be deleted from the main.

      Click the cell under the Action column for approval and change the action from Delete from ‘main’ to No action to perform.

   4. You know that Rule 1 has given excellent results, so you decide to add it to the main, by leaving the default action Add in ‘main’.
3. For the checkIncome rule, the table states No action to perform because this rule has changed in both branches, and is therefore in a state of conflict.
   1. Click next to the Action column for that row to see the Diff and Merge view.
   2. In the Diff and Merge view, click Next Difference.

      The first difference between the two rules is highlighted in yellow.

      
   3. Click Copy from Right to Left because you want to merge this particular change from the Spring Updates branch into the main.
   4. You decide that this is the only change you want in the main, so click Apply at the bottom of the window.

      You return to the Merge table.

   5. At this point, none of the changes you want have been saved, so click Apply Merge for the merge to take place.

      The Enterprise console displays a summary of the changes that were made.

      Note:

      This report is available in Excel format by clicking Manage Merge Reports on the Analyze tab.

4. Now see the history:
   1. On the Explore tab, select eligibility/checkIncome and click History.

      The checkIncome rule has three versions in the main:

      • Version 1.0, which is its original version number.

      • Version 1.1, which was updated when you edited the element before merging.

      • Version 1.2, corresponding to the changes resulting from the merge.