Comparing and Merging Versions

For any version that you modify in your development stream, if another team member has modified and delivered a version of the same element, you must merge the different versions when you rebase to a baseline that contains the delivered version.

Rational® ClearCase® merges all nonconflicting differences, as it does during the deliver operation. If versions in the baseline contain changes that conflict with the corresponding versions in your development work area, you are prompted to decide how to resolve conflicting differences.

To merge conflicting versions of an element:

  1. Follow the prompts provided in the Rational ClearCase tool.

After all conflicts have been merged, the rebase operation continues to completion. Now, you can build your files to test the rebase and verify that any undelivered work builds successfully with the changes in the new baseline.

The new UTF8 Compare/Merge tool can be used to perform Compare and "Merge operations on files that are UTF8 encoded. In the Microsoft® Visual Studio environment, this new tool is invoked automatically when you perform Compare/Merge operations on UTF8 encoded files when these files are of an element type associated with the utf8_file_delta type manager.