Version (regular expression)

Defines the names of the versions to be processed by a regular expression

X

Conflict handling

If a conflict occurs during the Reconcile of a version, here can be defined how the conflict is handled.

The following operations are available:

•Reconcile error: when a conflict occurs, the Reconcile process is stopped and an error message is stored in the log table.

•Child version wins: if a conflict occurs during the Reconcile process, this conflict will be resolved automatically. The conflicts are automatically resolved by overwriting changes in the parent versions (e.g. SDE.DEFAULT) with the child version changes.

•Parent version wins: if a conflict occurs during the Reconcile process, this conflict will be resolved automatically. The conflicts are automatically resolved by overwriting changes in the child versions (e.g. SDE.DEFAULT) with the parent version changes.

X

Conflict Level

Help to define on which level the Reconcile conflicts are detected:

•Row level: Complete table rows are checked for conflicts.

•Column level: Individual table fields are checked for conflicts.

X