Using tools to compare and merge files and directories

With the ClearCase Remote Client you can compare or merge files and directories.
Before you begin
You must connect to a Rational ClearCase server to compare a resource with its predecessor.
About this task

When you check in a modified resource, you may need to compare your changes with ones that another team member has made to the same resource and decide how to resolve any conflicts. Certain types of nonconflicting merges, called trivial merges, are handled automatically. For merges that require you to resolve a conflict, the ClearCase Remote Client includes tools that provide type-specific compare and merge capabilities for the following types of resources:

The available tools include external tools, based on programs that are included in the native ClearCase client, and internal tools, which include the ClearCase Remote Client Integrated (UTF-8) tools, Eclipse tools, and Rational Software Architect tools (if installed). Directory comparisons are only performed by the ClearCase tools or the ClearCase Remote Client Integrated (UTF-8) tools.

In the ClearCase Remote Client, they are invoked as needed by the ClearCase compare icon Compare with Predecessor operation or the Compare with Another ClearCase Version operation, and also by Rebase Stream, Deliver from Stream, ClearCase Merge Manager, the Pending Changes view, and the ClearCase Version Tree. Merge tools can also be invoked when you perform a check-in that requires merging.

You can customize the settings for these tools using the Compare/Merge Preferences page (ClearCase Remote Client > Integration > Compare/Merge).


Feedback