Comparing and Merging › Merge Versions Interactively

Merge Versions Interactively

The following procedure describes how to use the internal CA Harvest SCM interactive merge process and assumes that you want to resolve conflicts. If you selected Default for the merge tool preference, invoking interactive merge opens the interactive merge process. If you selected an external comparison tool for the merge tool preference, the external tool appears.

Note: For more information about using the external tool to visually compare file versions, see that tool's documentation.

Follow these steps:

1. Navigate to the item or merge-tagged version you want to resolve.
2. Right-click the item or version, and select interactive merge from the shortcut menu.

   The interactive merge process dialog appears.

   Note: The lowercase italic text indicates the process dialog name by the process type, since the process execution dialog names differ to each site.

3. Specify values to use for the merge; the versions for the Status, Name, and Path fields can be different.

   Note:

   • The two versions of the item being merged appear in the merge dialog with common blocks (lines identical in both versions) and conflict blocks. Conflict blocks are positioned side-by-side and are outlined.

     A conflict occurs when the same line or block of data is modified in both the branch and the trunk. Insertions and deletions are considered changes.

   • If the version being merged is a large file (according to your preferences set in the Version page), the Version Data field appears, which gives you an option to select the version data directly instead of opening the version content side by side to merge.
4. Resolve conflicts by manually editing the left pane text or by clicking the following toolbar actions:
   • Copy all nonconflicting changes from right to left.
   • Copy current change from right to left.

   The left pane represents the branch version being merged; the right pane represents the latest trunk version.

5. (Optional) Click Note to view information about the process.

   Click OK.

   The merge‑tagged version is replaced by a new, Normal-tagged version as the latest in the project's trunk.