Previous Topic: Compare a Package Version with TrunkNext Topic: Compare Two Versions

Comparing and Merging › Compare Workspace Files with Each Other

Compare Workspace Files with Each Other

You can compare a workspace file with one or two other workspace files to see how the files differ.

To compare a file with one or two other files

  1. Navigate the workspace tree, select two or three files that you want to compare, right-click, and select Compare With Each Other from the shortcut menu.

    If you selected two files, the comparison appears in the Compare editor and you can continue at Step 3.

    If you selected three files, the Select Common Ancestor dialog appears.

  2. (Three-way comparison only) Select a file to use for the common ancestor. Click OK.

    The comparison appears in the Compare Editor.

  3. Compare versions by navigating through the synchronized lines of code. You can locate lines that differ by clicking the bookmarks aligned vertically along the right side of the editor, or by clicking Select Next Change and Select Previous Change on the toolbar of the editor.
  4. (Optional) Type Ctrl+S to save your changes.

    The changes are saved.

    You have compared the workspace file with another file.