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 and model check in-check out.

To set default Mart actions, follow these steps:

  1. On the ribbon, click Tools > Options.

    The Options dialog box opens.

  2. Click the Mart tab and work with 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.

    Allow Model Checkout
    Select this check box to enable model check in and check out feature. Selecting this option saves a local copy of your mart model whenever you open or update it. Browse and select the location to save the local copy of the model.

This sets the tree-way merge options.