User Guide - MKS

Command Options
Setting Preferences
Resynchronize 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 when merging
upon resync.
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.
Resynchronize Change
Package
Use Master causes Source Integrity to operate on the top-level sandbox. When the
selected change package is associated with a member in a subsandbox, specifying
Use Master causes the command to operate on the top-level sandbox for that
subsandbox.
Overwrite Working File if Changed overwrites the working file even if it has changed.
Perform Merges prompts you for confirmation before performing a merge operation.
Confirm Actions causes Source Integrity to confirm all operations with you before
starting them.
Verbose provides additional information to track the status of the command.
Already in Project is Error causes Source Integrity to terminate the operation if the
member being applied is already in the project. If this setting is negated (as in
noAlreadyInProjectIsError), the information is displayed as a warning.
Ignore Server in Change Package causes Source Integrity to perform the Resync CP
operation even if the change package members reside on different servers.
Span Projects applies the command to any member specified in the change package,
even if this involves multiple projects. This option allows Source Integrity to search
across local sandboxes for all entries in the selected change package(s).
Ignore Cross-Branch Entries causes Source Integrity to use the most recent revision
when it encounters two revisions of the same member on different branches.
Restore Revision Timestamp sets the timestamp of the working file to the date and
time of the last checked-in revision in the history. If this option is cleared, the working
file’s timestamp is set to the current date and time. The time stamp is only changed if
the working file is modified. If the resynchronize does not change the working file, its
timestamp remains the same.
57