User Guide - Mks.com

Chapter 10: Branching and Merging Revisions
358
7 Enter the file name you want to save your merge result as. By default,
Source Integrity selects the file name corresponding to the member
name.
8 Click Save to save the Merge Result.
The Merge Result is saved.
Merging Blocks
Difference blocks are highlighted within each revision and may be
insertions, deletions, or changes. You can select the blocks you want to
merge by this method.
The merging by blocks functions are accessible from the Edit menu and the
shortcut menu. The following outlines the operations you can use:
Merge Block replaces a block in the Merge Result. The block you select
to merge is inserted, replacing the corresponding block in the Merge
Result.
Merge Block Above inserts the selected block above the adjacent block
in the merge result file.
Merge Block Below inserts the selected block below the adjacent block
in the merge result file.
You can also perform these operations in the following ways:
Double click a block in the Merge From or Merge To panes to replace
the adjacent block in the Merge Result.
Drag blocks from the Merge From and Merge To panes to the Merge
Result pane.
You must save the merge result file to complete the merging operation. For
information on saving merge results, see “Saving Merge Results” on
page 360.
u s e r g u i d e