CA ERwin Data Modeler User Interface › The Data Modeling Workspace › Global Default Options › Set Default Actions for a Three-Way Merge

Set Default Actions for a Three-Way Merge

Use the Mart tab in the Options dialog to set default actions for a three-way merge.

To set default actions for a three-way merge

1. Click Options on the Tools menu.

   The Options dialog opens.

2. Click the Mart tab and work with the following options.

   Bypass Difference Reconciliation Dialog if there are no conflicts

   Select this check box to skip the Difference Reconciliation dialog if no conflicts are detected between the version of the model in the mart and the local version. If no conflicts are detected, the local copy is updated from the mart version before the model is saved.

   Show All Objects in Difference Reconciliation Dialog

   Select this check box to turn off the options to optimize the compare process. The Difference Reconciliation dialog will display all objects including those that were not modified in the checked out model and in the mart copy of the model.

3. Click OK.

   Three-way merge options are set and the Options dialog closes.