Comparing Folders

Using the standalone File Compare/Merge, you can compare and restructure folders on your computer. You can also start a file comparison from a folder comparison. If you have not modified the General options settings, File Compare/Merge automatically begins comparing folders as soon as you select them.

File Compare/Merge provides a context menu and toolbar with the most commonly used actions that you will need to perform in the editor panes.

  1. From the Windows desktop, choose Start > Program Files , navigate to your StarTeam program installation group, and choose File Compare Merge.
  2. Choose File > New Folder Comparison ( Ctrl+Shift+N ) to open a new folder comparison tab.
    Note: Using the New Folder Comparison command opens the folder comparison results with Auto Commit On. To open a folder comparison with Auto Commit Off, choose File > New Folder Merge . Once File Compare/Merge is opened, you can click Auto Commit Mode on the toolbar to toggle between Auto Commit On or Auto Commit Off.
  3. Click the Open New Comparison button at the top right of each editor pane, and browse to the folder you want to compare.
    Note: Alternatively, you can type the path to each folder to the left of the Save Changed Text File button, or click the drop-down arrow on the Open New Comparison button and select a folder from the history list.

    By default, File Compare/Merge immediately compares the selected folders, and the results display in the two panes of the File Compare/Merge window. You can change this and other default settings in the File Compare/Merge Options dialog box on the General and Folder Comparison pages.

  4. Optionally, right-click and choose Switch Comparison Modes to choose a different comparison mode display.

    If you choose one of the 3-Way comparison modes, you will have a third pane.

  5. Perform any required changes to the folders directly in the edit panes. You can move, delete, and copy folders from one pane to the other, and are prompted to commit your changes.

    If there are differences between individual files in the folders you are comparing, you can also start a file comparison from the folder comparison pane. Double-click the file in the folder comparison pane, or selecting it and click Open New Comparison on the toolbar. A new file comparison pane opens displaying the contents of the two files where you can edit, merge, and save your changes.

File Compare/Merge highlights the differences between the two folders using colors and linked lines, with the linked lines connecting the related differences between the panes.

Tip: You can open additional folder comparison windows by choosing File > New Folder Comparison on the File Compare/Merge main menu, or by pressing Ctrl+N .