Integration Lesson 2 – Quick Merge

In the second lesson, we will perform a quick merge of a trunk and branch module.

Navigate to the trunk project for this lesson (/4.0 Trunk for Username), and open its module in Exclusive Edit mode. We will call this the source module, since it will be the source from which changes are pushed to targets.
To begin a quick merge, choose the Configuration Mgt > Quick Merge menu option.
Here we see the Quick Merge dialog box. For a description of the Quick Merge GUI parts, please consult the Branch Manager User Manual. Press the Add Target button to select the target to push changes to.
Select the branch project for this lesson (/4.2 Quick Merge for Username), then press the OK button. The script will automatically find the parallel module.
Check the Select Common box as well as the Test Status box in the list of attributes. Then press the OK button.
This brings us back to the Quick Merge GUI, and now the target project is shown.
With a target chosen, look now at our source module. We see a column has been added containing the changes. These changes are given in the form of how the target would be changed to match the source.
To see the target module, double-click its project name in the Quick Merge GUI.
We see that for ORG_13, the target module’s object heading is "This heading has changed?"
Looking now at ORG_13 in the source module, the heading is "This heading changed." And now notice that the change shown in the added column in the source module, describes how to change the target heading into the source heading.
To merge a single changed object from the source module to the target module, select the object in the source module (ORG_13), and then press the Merge button in the Quick Merge GUI.
When you look at the target module now, you see that ORG_13’s heading has changed to that of the source.
Looking at the source module, you see that the change text in the added column has disappeared.
You can quick merge a selection of objects as well. In the source module, click on the ORG_11 object to select it. Then, while holding down the shift button, click on the ORG_54 object. This selects three objects: ORG_11, ORG_12, and ORG_54.
When you press the Merge button in the Quick Merge GUI, notice again that the change text in the added column has disappeared.
Looking at the target module, you see that ORG_12 and ORG_54 have been modified to match the source module. ORG_11 was not modified since it was not different than the source.
Let’s change the target module ORG_54. Delete the words "Test Status" from the object’s text.
In the Quick Merge GUI, press the Refresh Comparison button.
In the source module, we see that the added column for change text has been updated to show how the target object would be changed to match the source object.