Using the Consolidation Options window

Chapter 3 Basic Repository Tasks

Using the Consolidation Options window

The Consolidation Options window allows you to specify how differences between your local copy of a document and the repository version are resolved during consolidation.

You can arrive at this window in any of the following ways:

Click the Options button at the bottom of the Consolidate Document window. Note that this button is only available if you are consolidating a single document.
Click the Consolidation Options tool in the Consolidate Multiple Documents window. The options specified will apply to all the documents being consolidated.

You can choose either of the following consolidation modes in this window:

Consolidation Mode	Description
Interactive	[default] Opens the Consolidate Model window (see Using the Consolidate Model window) before consolidation, to allow you to compare the local and repository versions of a model document, and to review and approve or reject differences for consolidation.
Batch	Automates consolidation of documents. If you select this mode, you must specify one of the following sub-modes for resolving conflicts: Use my changes – changes in the local model document prevail against changes (made by other users) in the repository version. Keep repository changes – changes in the repository version of the compartment prevail against changes in the local version. Resolve manually – if conflicts exist, the Consolidate Model window (see Using the Consolidate Model window) opens to allow you to resolve conflicts. You can set this mode as the default by selecting Tools→General Options, clicking Repository in the left-hand pane, and selecting the Batch update check box.

Consolidation Mode

Description

Interactive

[default] Opens the Consolidate Model window (see Using the Consolidate Model window) before consolidation, to allow you to compare the local and repository versions of a model document, and to review and approve or reject differences for consolidation.

Batch

Automates consolidation of documents. If you select this mode, you must specify one of the following sub-modes for resolving conflicts:

Use my changes – changes in the local model document prevail against changes (made by other users) in the repository version.
Keep repository changes – changes in the repository version of the compartment prevail against changes in the local version.
Resolve manually – if conflicts exist, the Consolidate Model window (see Using the Consolidate Model window) opens to allow you to resolve conflicts.

You can set this mode as the default by selecting Tools→General Options, clicking Repository in the left-hand pane, and selecting the Batch update check box.