Merging Two Local Files

Use the standalone File Compare/Merge to compare and merge the contents of two files on your computer.

  1. Click Start > All Programs > Micro Focus > StarTeam Cross-Platform Client <version> > File Compare Merge.
  2. Click the Open New Comparison button at the top right of each editor pane.

    Browse to the files you want to compare, or enter the path for each file in the directory field above each pane.

    Tip: The DOWN ARROW to the right of the Open New Comparison button above each pane stores a history list of the previously-opened files in that pane from which you can choose.

    By default, the files are immediately compared, and displayed in the panes with line numbers.

    File Compare/Merge highlights the differences between the two files using colors and linked lines, with the linked lines connecting the related differences in the two files. You can set the colors used in the editor panes in the File Compare/Merge Options dialog box on the Color Preferences page for File Comparisons.

  3. Right-click in any pane and choose Switch Comparison Modes.

    Choose 3-Way Vertical, 3-Way Horizontal, or 3-Way Mixed.

    In the 3-Way Vertical and 3-Way Horizontal comparison modes, the merged base file is in the center pane. In the 3-Way Mixed comparison mode, File Compare/Merge places the merged base file in the lower pane.

    Tip: You can open additional file comparison windows by choosing File > New Comparison on the File Compare/Merge main menu, or by pressing Ctrl+N .
  4. Perform any required edits to the files directly in the edit panes.

    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.

  5. Optionally, right-click in one of the panes and choose Generate Report.

    To print the report, choose File > Print .

    Note: If you want a report of your changes, you must generate it before closing the File Compare/Merge session.
  6. Choose File > Save All to save all of your changes, or click Save Changed Text File button above each pane to save them individually.
  7. Optionally, test the modified file to ensure there are no problems with it.
  8. Check in the file.