Comparing resources with repository versions

You compare repository files to find the differences between two versions of a file and to reconcile conflicting changes made by the team members. You can compare a repository file with its immediate predecessor version in the repository workspace or compare a repository file with its copy in the local workspace.

Before you compare, you must have checked out the file from the repository and made some changes. You can compare files either from the Solution Explorer tool window, from the Pending Changes tool window, or from the History tool window.

To compare files from the Solution Explorer tool window, right-click the resource and click Compare With > Previous in Repository. The Compare and Merge window opens. Each difference is highlighted surrounded with a box. You can use the navigation buttons in the toolbar to move between the differences or incorporating the changes.

To compare files from the Pending Changes tool window, save the modified file and navigate toUnresolved. Right-click the file and select Open in Compare Editor.

To compare resources from the History tool window, right-click the change set and click either Compare with Previous or Compare with Local. The Compare with Previous option compares the selected version of the file with its immediate predecessor in the repository and Compare with Local compares the selected file with its copy in your local repository workspace.

Feedback

Did this help? You can provide feedback at Jazz.net (registration required): Comment in the forums or submit a bug