Using the Plug-In › Interactive Merge Process

Interactive Merge Process

The interactive merge process lets you do the following:

• Combine the changes made on unmerged branches with changes on the trunk.
• Resolve a merge-tagged version after it is created by the concurrent merge or cross project merge process.

The interactive merge process lets you perform a two-way or three-way merge depending on the preference settings of the external compare-merge tool (under Tools, Options).

To perform an interactive merge

1. In the Visual Studio IDE, open Harvest SCM Explorer.
2. Navigate to the merge-tagged (M) version you want to resolve.
3. Right-click the version, and select interactive merge process from the shortcut menu.

   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.

   Note: 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.

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. Save changes and close the third-party merge tool.

   The interactive merge process dialog appears.

6. Specify values to use for the merge; the versions for the Status, Name, and Path fields can be different.
7. (Optional) Click Note.

   Information about the process appears.

8. Click OK.

   A new, normal-tagged (N) version replaces the merge-tagged (M) version.

More information:

Specify Compare/Merge Utilities