Manually Completing the Merge

Purpose

Manually complete the merge when:

There are conflicting differences between the derivatives and you need to select which versions to include in the target.
You have not selected the Auto Merge option and you need to manually select which differences are included from the derivatives or ancestor.
You wish to make other changes by editing the target file.

To select the differences for inclusion in the target:

To select a difference for inclusion in the target, right-click the required line in the ancestor or derivative window. To select two adjacent differences, use Ctrl and right-click. The color of the line(s) will change to the selected color.
To deselect a difference from inclusion in the target, right-click a selected line. To deselect two adjacent differences, use Ctrl and right-click. The color of the line(s) will change to the unselected color.
To insert all the differences, including conflicts, for a given derivative into the target, select Edit | Select All, or press Ctrl + A. All the lines in the selected derivative will change to the corresponding "selected" colors.

NOTE Selecting all differences in one derivative does not necessarily mean you have deselected all differences in another derivative.

To Edit the Target File:

To copy text, select the text to be inserted into the target and click the Copy button or press Ctrl+C.

To paste text into the target, position the cursor where you want to insert the text and click the Paste button or press Ctrl+V.

To edit text in the target, type or overtype the text in the target window.

To undo editing, select Edit | Undo, or press Ctrl+Z.

To save the Target File:

Do one of the following:

Select File | Save Target
Click the button
Press Ctrl+S

If you have not saved the target when exiting the Merge Tool, and the option Always perform merge interactively has been set, a dialog box appears prompting you to save the target. If there are any unresolved conflicts a further dialog box appears warning you that there are unresolved conflicts.