Important: You must specify File Compare/Merge as the alternate compare/merge tool before you can use it to compare and merge files.
This procedure presents the basic high-level task involved in comparing and merging a local file with a file in the StarTeam
repository, which opens the File Compare/Merge component.
There are two ways to launch File Compare/Merge. Do one of the following:
In the
History view, select two files to compare.
In the Package Explorer view, select a
StarTeam repository file in the view to compare with your local file or select two files to compare.
Done one of the following from the context menu:
Right-click and select
Merge File Contents.
Right-click and select
Compare With
> Remote File in External Comparison Application
or
Compare With
> Each Other in External Comparison Application.
The File Compare/Merge session opens in a separate view or window, with each file in its own edit pane.
Perform any required edits to the files directly in the edit panes.
Tip: You can find additional procedures for Comparing and Merging Files in the online help of the File Compare/Merge tool.