User Guide - MKS

Chapter 10: Branching and Merging Revisions
318
Configure the Merge Type option to specify the method you want
to use for merging. Select one of the following from the list:
Confirm causes Source Integrity to prompt you for the action
to be taken.
Cancel causes Source Integrity to cancel the merge
operation.
Automatic causes Source Integrity to automatically merge
the files.
Manual causes Source Integrity to launch the MKS Visual
Merge tool.
Configure the On Conflicts option to specify how you want
Source Integrity to handle any conflicts that occur during
merging. Select one of the following from the list:
Confirm causes Source Integrity to prompt you for the action
to be taken.
Cancel causes Source Integrity to cancel the merge operation
when a conflict occurs.
Mark For Later Merge causes Source Integrity to exit the
merge operation and mark the working file with an
unresolved merge icon.
Launch Tool causes Source Integrity to launch the MKS
Visual Merge tool.
Highlight Output File causes Source Integrity to
complete the merge automatically and highlight the output
file where any conflicts occurred.
6 Under Change Package, select a change package to associate with the
merged file from the Change Package list.
Click Create to create a new change package for the file.
NOTE
The Change Package options only appear if the Integrity Manager integration
is enabled.
7 To merge the revision, click OK. To merge revisions of more than one
member, click OK to All.
u s e r g u i d e