User Guide - MKS

Command Options
Setting Preferences
Check Out continued Merge Type specifies the action to be taken when merging revisions. Select one of the
following options from the list:
Confirm causes Source Integrity to confirm the action to be taken each time you
merge upon check out.
Cancel causes Source Integrity to cancel the operation.
Automatic causes Source Integrity to perform an automatic merge. For more
information on automatic merging, see “Step Two: Merge Branch” on page 313
Manual (Launch Tool) causes Source Integrity to initiate the MKS Visual Merge
tool.
On Conflicts specifies the action to be taken when merge conflicts occur. Select one of
the following options from the list:
Confirm causes Source Integrity to confirm the action to be taken each time a
conflict occurs.
Cancel causes Source Integrity to cancel the operation when a conflict occurs.
Mark For Later Merge causes Source Integrity to mark the files for merging at
another time, allowing you to resolve the conflict first.
Launch Tool causes Source Integrity to initiate the MKS Visual Merge tool.
Highlight Output File causes Source Integrity to highlight conflicts in the
resulting merged revision.
Ask for change package causes Source Integrity to ask for a change package when
performing a check out.
Close Change Package Release Locks causes Source Integrity to release all locks on members in the change
package.
Allowed Orphaned Deferred Operations allows the change package to be closed
without first submitting its deferred entries.
Note: Orphaned Deferred operations can never be submitted using the Submit
Change Package command.
Configure Subproject Select one of the following options as the preferred type of subproject when
configuring a subproject:
Normal configures a subproject based on the current state of the project.
Variant configures a subproject based upon a specific revision of the master project
and is used for branching off the main development path.
Build configures a static subproject based upon a specific revision of the master
project that is used for building or testing the project, but not for further
development.
Reset to default value configures a subproject based on the parent project type. For
more information on the default type, see your administrator.
Create Sandboxes Populate Sandbox causes Source Integrity to add working files to the sandbox.
Recurse Into Subprojects creates subsandboxes recursively from subprojects.
Make Sandbox Sparse creates a sandbox with no working files.
View Sandbox After Creation displays the sandbox after it is created.
Line Terminator determines the type of line terminator Source Integrity uses when
dealing with sandbox members: Native (or automatic, the default setting), LF (or line
feed, primarily for UNIX applications), or CR/LF.
53