User Guide - Mks.com

Chapter 10: Branching and Merging Revisions
Merging in the
Command Line
Interface
366
To suspend merges in MKS Visual Merge
1 In MKS Visual Merge, click the Close button on the status bar.
The Mark for Later Merge dialog box is displayed.
2 Click Yes to mark the revision for merging at a later time.
In your Sandbox view the member is marked with an unresolved
merge symbol ( ) and in the member information pane
Source Integrity indicates that resolution is required.
To resolve a suspended merge, see “Resolving Merges” on page 367.
In the command line interface, you can merge two revisions using the si
merge command. Merging in the command line interface operates as the
graphical user interface where two revisions and a working file are
compared and merged.
You can also launch the MKS Visual Merge and MKS Visual Difference
tools from the command line interface by using the -g option with the
merge command.
To merge two revisions in the command line interface
Use the si merge command:
si merge -r value -r value member --sandbox=value
where
-r value -r value specifies the revisions you want to merge, for
example, -r1.1 -r1.2.
member specifies the member whose revisions you want to merge, for
example, demoapp.c.
--sandbox=value specifies the sandbox containing the member whose
revisions you want to merge, for example, c:/sandboxdemo/
project.pj.
Depending on the preferences you have set for the Merge command (see
“Command Preferences” on page 48), Source Integrity may ask one or both
of the following questions:
u s e r g u i d e