User Guide - MKS

Chapter 10: Branching and Merging Revisions
Merging Revisions
Merging
Revisions
Automatically
322
Source Integrity offers a number of different methods to merge revisions.
This section describes the methods of merging revisions automatically or
by using the MKS Visual Difference and MKS Visual Merge tools. These
tools are available through the graphical user interface only, but can be
launched from the command line interface. Command line interface
procedures are also included in this section.
For more information on MKS Visual Difference, see “MKS Visual
Difference Interface” on page 95.
For more information on MKS Visual Merge, see “MKS Visual Merge
Interface” on page 101.
For more information on the command line interface, see “Command Line
Interface” on page 92.
IMPORTANT
Members must be checked out before you can merge them.
If you do not want to use MKS Visual Difference or MKS Visual Merge to
merge revisions in the graphical user interface, you can merge revisions
automatically.
To merge revisions automatically in the graphical user interface
1 From a Sandbox or Member History window, select the revisions you
want to merge.
2 Do one of the following:
From the Sandbox window, select Member > Diff/Merge > Merge.
From the Member History window, select History > Merge.
The Merge dialog box appears.
u s e r g u i d e