User Guide - MKS

Chapter 3: Getting Started Using Source Integrity
Command Options
56
Merge continued 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.
Promote Recurse Into Subprojects promotes all members in subprojects.
Rename Member Rename Working File renames the working file in your sandbox and preserves any
changes made to that file. If not set, the working file is not renamed and becomes a
former member which will be confirmed for deletion the next time the sandbox is
resynchronized. This setting has no effect if the command is performed directly from a
Project window.
Confirm Rename causes Source Integrity to confirm that you want to rename the
selected member.
Close Change Package closes the specified change package after performing the
rename operation.
Overwrite Existing File replaces the existing working file in the sandbox.
Defer Rename delays the rename operation in the project until the deferred operation
is submitted.
Resynchronize Restore Revision Timestamp sets the timestamp of the working file (that the revision is
checked out to) to the date and time of the revision in the history. If this option is not
set, the working file’s timestamp is set to the current date and time.
Force Overwrite Even if Unchanged overwrites the working file even if it is unchanged.
Merge Working File if Changed merges the modified working file with the member
revision.
Confirm Populate of a Sparse Sandbox causes Source Integrity to prompt you to
confirm if you want to populate a sparse sandbox.
Overwrite Working File if Changed overwrites the working file even if it has changed.
Overwrite if Deferred Operation Pending overwrites the working file if there is a
deferred operation pending on the member.
Recurse into Subprojects recursively resynchronizes members in subprojects.
Keywords allows you to select keyword expansion options when resynchronizing. To
replace keywords in the revision with literal values in the working file, select Expand
from the Keywords list. To leave keywords unexpanded, select Do Not Expand from
the Keywords list. To replace literal values in the revision with keywords, select
Unexpand from the Keywords list.
u s e r g u i d e