Resolve Options Tab

Use the Resolve Options tab to set defaults for Merging behavior when using the Resolve transaction. To open the Resolve Options pane, from the Configuring Window, choose Options Configuring and select the Resolve tab.

This tab contains the following checkboxes:

Auto Start Merging Window Starts Merging whenever the Resolve Transaction category is selected and unresolved conflicts are present. Otherwise, you can start Merging by clicking the Merging button.
Auto Advance Automatically advances to the next unresolved difference after resolving the current difference.
Prompt for Checkin Comments Prompts you for a custom check-in comment. Otherwise, when a file is checked in after conflicts are resolved, Sun WorkShop^TM TeamWare automatically includes a standard comment.
Use Existing Merging Window Reuses a running Merging process, rather than starting up a new process.
Auto Save Saves and checks in the files if all the differences in the file can be resolved. You need not select the Merging Save button.

Auto Start Merging Window	Starts Merging whenever the Resolve Transaction category is selected and unresolved conflicts are present. Otherwise, you can start Merging by clicking the Merging button.
Auto Advance	Automatically advances to the next unresolved difference after resolving the current difference.
Prompt for Checkin Comments	Prompts you for a custom check-in comment. Otherwise, when a file is checked in after conflicts are resolved, Sun WorkShop^TM TeamWare automatically includes a standard comment.
Use Existing Merging Window	Reuses a running Merging process, rather than starting up a new process.
Auto Save	Saves and checks in the files if all the differences in the file can be resolved. You need not select the Merging Save button.