You can use File Compare/Merge to merge the contents of a local working file with the tip revision of the file in StarTeam. For example, if the file in your working folder has been modified, but is not based on the tip (latest) revision of this file, it is marked with a Merge status. This status usually occurs when you and another person have both been working on a file, but the other person has checked it in before you. To check in your edits without losing the edits of the other person, you can compare the contents of the files, reconcile the differences between them, and merge the contents into one file.
To merge a local file with the tip revision
A message appears giving you the option to merge the contents of the two files.
The File Compare/Merge window opens in a 3-way Vertical comparison mode. The two files you are comparing display in the right and left panes, and a center pane displays the merged base file. If you want to use a different comparison layout, right-click in one of the panes and choose Switch Comparison Modes. You can choose either 3-way Horizontal or 3-way Mixed comparison mode. In the 3-way Mixed mode, the base file is in the lower pane.
To print the report, choose .
File Compare/Merge closes, and updates the file status to Modified in StarTeam.