User Guide - MKS

Chapter 10: Branching and Merging Revisions
Working With
MKS Visual
Difference
324
The merge operation may be canceled, the MKS Visual Merge tool
may be launched, the output file may be highlighted, or the revisions
may be marked for merging later.
Select an option, then Click OK. Source Integrity provides a message
indicating why the merge was canceled.
6 Check in the merged revision.
The MKS Visual Difference tool is a graphical application that allows you
to compare revisions. It offers two-way differencing of revisions where
differences are highlighted for you. MKS Visual Difference operates in two
modes, Difference mode and Merge mode. You must be in Merge mode to
merge revisions in MKS Visual Difference.
Merging Two Revisions
You can use MKS Visual Difference to merge differences between two
revisions selected from a member history or the member revision and
working file. The graphical user interface and command line interface
allow you to merge differences between two revisions.
To merge two revisions in the graphical user interface
1 Compare two revisions whose differences you want to merge, as
described in “Comparing Revisions” on page 301.
2 In Visual Difference, do one of the following:
Select File > Merge.
Click .
The Reassign Merge Roles dialog box appears.
u s e r g u i d e