File Compare/Merge is a graphical file and folder comparison and merge tool delivered with StarTeam. It enables you to compare the contents of two files or folders, and manually or automatically merge the contents. The File Compare/Merge panes highlight differences using a configurable color scheme, and dynamic action buttons display in the highlighted areas to simplify the merging process.
There are three versions of File Compare/Merge, and how you start File Compare/Merge determines which features are available. The ability to edit text files in a File Compare/Merge pane depends on which version of File Compare/Merge you are using, and what type of files you are comparing and merging. The following sections describe editing capabilities in each version of File Compare/Merge.
The main File Compare/Merge window is displayed using menu commands in the client, and allows you to edit a local file, a merged base file, and a copy of a repository revision. When it opens in a separate window you are able to do the following:
The main File Compare/Merge gives you the option of viewing a third pane for displaying the merge results. You can edit the contents in the third pane and save your merged results.
You can start File Compare/Merge using context menus on selected files in the StarTeam client, or by checking in an older version of a file which causes a merge situation. You can also access File Compare/Merge directly from the View Compare/Merge tool.
In the embedded File Compare/Merge no editing is possible. This view gives you a quick way to do a comparison of text in two files or versions of the same file, as well as compare properties of non-file items such as change requests. If you are comparing two text files, It performs a dynamic comparison of two selected files, or the selected repository file with your local working copy. It displays the text contents of both files in an embedded pair of panes at the bottom of the StarTeam window. These embedded panes only compare the contents of two text files, and do not permit editing or merging.
If you are comparing the properties of two non-file items, only the property values of each selected item display in the embedded panes.
When the embedded File Compare/Merge is activated, it immediately compares the files or properties when you do one of the following:
In the standalone File Compare/Merge you can edit all files being compared and merged. The standalone is started outside of the StarTeam client from the Windows Start menu. This File Compare/Merge compares files, folders, and images, and it can merge the contents of two text files or two folders. Unlike the main File Compare/Merge, the standalone version does not compare any local files with files that are in the StarTeam repository. It compares and merges two or three files, folders, or images that are on your local computer or network. You can edit text file contents directly in the File Compare/Merge panes, and you can move lines or blocks of text between the panes. You can also move folders between the panes during a folder comparison or merge.