02.05.2013 Views

User Guide - Mks.com

User Guide - Mks.com

User Guide - Mks.com

SHOW MORE
SHOW LESS

You also want an ePaper? Increase the reach of your titles

YUMPU automatically turns print PDFs into web optimized ePapers that Google loves.

Merging Revisions<br />

2 Save the merge result file to retain the changes as described in “Saving<br />

Merge Results” on page 364.<br />

Merging by Blocks<br />

If you do not want to merge entire revisions you can merge by difference<br />

blocks or lines. Difference blocks are highlighted within each revision and<br />

may be insertions, deletions, changes, or conflicts.<br />

The merging by blocks functions are accessible from the Edit menu and the<br />

shortcut menu. The following outlines the <strong>com</strong>mands you can use:<br />

Merge Block inserts the selected block or line into the merge result file<br />

in the same location as it appears in the revision it originated from.<br />

Merge Block Above inserts the selected block or line above the adjacent<br />

block in the merge result file.<br />

Merge Block Below inserts the selected block or line below the adjacent<br />

block in the merge result file.<br />

In addition to these <strong>com</strong>mands, in MKS Visual Merge you can simply<br />

select a block and double click it or drag it into the merge result file.<br />

You must save the merge result file to <strong>com</strong>plete the merging operation. For<br />

information on saving merge results, see “Saving Merge Results” on<br />

page 364.<br />

Editing Merge Results<br />

While you are working in MKS Visual Merge you can directly edit the<br />

merge result if necessary.<br />

In MKS Visual Merge you can cut, copy, and paste text in the merge result.<br />

MKS Visual Merge highlights the edited text and displays the edit icon ( )<br />

next to the line number. You can access editing functions in the following<br />

ways:<br />

From the Edit menu, select Cut, Copy, Paste, or Select All.<br />

From the toolbar, click the Cut, Copy, or Paste buttons.<br />

From the shortcut menu, select Cut, Copy, Paste, or Select All.<br />

Use the following shortcut keys:<br />

Cut = CTRL+X<br />

Copy = CTRL+C<br />

Paste = CTRL+V<br />

Select All = CTRL+A<br />

363

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!