User Guide - MKS

Merging in the
Command Line
Interface
Merging Revisions
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:
where
si merge -r value -r value member --sandbox=value
-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:
How would you like to perform the merge?
Select an option from the list provided.
How would you like to handle conflicts?
Select an option from the list provided.
Source Integrity merges the differences between the two revisions and
saves them to the member’s working file.
Check in the merged revision.
For a complete list of options for the si merge command, see the
Source Integrity Enterprise Edition CLI Reference Guide.
335