Using Diff and Merge

Use Diff and Merge when there are several changes to the rule and you want to specify which of these changes to merge.

About this task

Diff and Merge displays the contents and properties of each branch of the project element side by side. You can step through each difference in turn, visually compare the values, decide which value you want to retain, and copy it from one side to the other. You can request a partial merge by resolving some differences and retaining others.

Procedure

To use Diff and Merge:

In the Diff and Merge menu bar, click Next Difference. Diff and Merge highlights the next available difference in the project element.
Choose between the following actions:
- To merge the difference, click Copy from Right to Left or Copy from Left to Right depending on which value you want to retain. No changes are made to the project element at this stage.
- To retain this particular difference, click Next Difference.
Repeat the previous steps to work through each instance of a difference that you intend to resolve. You do not need to resolve every difference.
Note:
To undo the most recent individual merge, click Revert.
When you have finished specifying how you want to resolve each difference, click Apply.

Results

Diff and Merge closes and you return to the table displaying the list of project elements that contain differences in the two selected branches. At this point, the changes you have specified are not committed. The project element you have worked on displays the action Apply Merge, indicating that this project element is now ready for you to apply the merge. For information on how to apply the merge to commit the changes, see Using branch merging.