|
Options
|
Description
|
|
Lock Target Revision
|
Locks the merged revision when the merge is complete using the lock type specified in your locks policy. For information on the locks policy, contact your administrator.
|
|
Merge Type
|
Specify the method you want to use for merging. Select one of the following from the list:
• Confirm prompts you for the action to be taken.
• Cancel cancels the merge operation.
• Automatic automatically merges the files.
• Manual launches Visual Merge or a third party merge tool, based on your preferences.
|
|
On Conflicts
|
Specify how you want Windchill RV&S to handle any conflicts that occur during merging. Select one of the following from the list:
• Confirm prompts you for the action to be taken.
• Cancel cancels the merge operation when a conflict occurs.
• Mark For Later Merge exits the merge operation and mark the working file with an unresolved merge icon.
• Launch Tool launches the Visual Merge tool.
• Highlight Output File completes the merge automatically and highlight the output file where any conflicts occurred.
• Error displays an error message prompt.
|