You can use an external compare tool to compare the local version of a file with the one on the CA Harvest SCM repository from Workspace. The external compare tools display the differences in an intuitive way that is easy to view and understand. You can then decide the changes you want to merge. Each compare tool provides different options and benefits; select the tool that best fits your purpose. Workspace uses the external compare tool that you have configured for Workbench.
Note: The Compare Tool option in the Preferences dialog lets you configure the external compare tool you want to use for performing a 2-way or 3-way compare or merge from the Workspace. DiffDoc does not support comparison from Workspace.
For more information about the external compare tools packaged with CA Harvest SCM and the default command line settings, see chapter "Comparing and Merging Versions."
You can invoke the external compare tool by performing the following operations in the Workspace:
Note: Managed resource includes outgoing changes, incoming changes, and conflicts.
|
Copyright © 2015 CA Technologies.
All rights reserved.
|
|