User Guide - MKS

Merging by Nonconflicting Blocks
Merging Revisions
Merging by nonconflicting blocks allows you to merge without including
any areas of conflict. MKS Visual Merge incorporates all difference blocks
(except conflict blocks) from the Merge From revision into the merge result
file.
To merge revisions by nonconflicting blocks in MKS Visual Merge
1 Do one of the following:
Select Edit > Merge All Nonconflicting Blocks.
Click .
All nonconflicting difference blocks are applied to the merge result
file.
2 Save the merge result file to retain the changes as described in “Saving
Merge Results” on page 333.
Merging by Blocks
If you do not want to merge entire revisions you can merge by difference
blocks or lines. Difference blocks are highlighted within each revision and
may be insertions, deletions, changes, or conflicts.
The merging by blocks functions are accessible from the Edit menu and the
shortcut menu. The following outlines the commands you can use:
Merge Block inserts the selected block or line into the merge result file
in the same location as it appears in the revision it originated from.
Merge Block Above inserts the selected block or line above the adjacent
block in the merge result file.
Merge Block Below inserts the selected block or line below the adjacent
block in the merge result file.
In addition to these commands, in MKS Visual Merge you can simply
select a block and double click it or drag it into the merge result file.
You must save the merge result file to complete the merging operation. For
information on saving merge results, see “Saving Merge Results” on
page 333.
Editing Merge Results
While you are working in MKS Visual Merge you can directly edit the
merge result if necessary.
331