Setting automatic merge options

Use the Automatic Merges options on the Command page of the Options window to specify an automerge policy.

Normally, you set an automerge policy before starting the merge, either at the command line, by using another Rational® ClearCase® tool such as Merge Manager, or in this window. You can use this window to change automerge options at any point during a merge session. However, be aware that this action restarts your merge: consider saving any work in the merge output pane first.

Also, if you initiated the merge through the Rational ClearCase type manager (for example, using the Merge Manager or Version Tree Browser), it may not want to change contributors by using the Open Contributors window. Instead, modify merge parameters and restart the operation using the Rational ClearCase tool that you used initially. Table 1 describes the automerge options.

Table 1. Automatic merge options
Option Description
Accept from any contributor Differences in any contributor that are not conflicts can be used in the merge result.
Accept from to-contributor only Only non-conflicting differences in the to-contributor can be used in the merge result.
Accept none Do not perform an automatic merge. Choose this option if you want to resolve all differences manually.

Feedback