Show TOC

Conflict EditorLocate this document in the navigation structure

Use

You can use this editor to edit a version conflict resulting from an import. You can display the conflicting versions of an object. In particular, you can select a version for additional processing and reject the other versions.

Prerequisites

You can access the conflict editor in the following situations:

  • You open an object for which a version conflict exists in a change list .
  • You open an object on the Conflictstab page (only in the Enterprise Services Repository, see Conflicts During the Import of Design Objects ).
  • You open an object for which a version conflict exists on the Objects  tab page (only in the Enterprise Services Repository).
Features

You can use the functions in the application toolbar in the conflict editor to display different object versions.

Pushbuttons in the Conflict Editor

Pushbutton Description

Display Active Version

Displays the currently active object version in a separate window.

Display Imported Version

Displays the imported object version that is causing the conflict.

The imported object version is displayed when you call the conflict editor from the navigation area in the Enterprise Services Builder.

Display New Version

Displays the new version of an object. A new version is created when you edit a version that is involved in a conflict and has already been closed. This is possible in the following situations:

  • You select the active version and then edit this.
  • In the event of a conflict, you select the conflicting version on the Conflicts tab page in the navigation area in the Enterprise Services Builder and edit this version.

The system generates a new object version here whose content is based on the version selected previously. You have the option of toggling between three versions. The new version is then the result of combining the conflicting versions.

A new version cannot be created if the conflict was generated during activation of a change list. In this case, the entire change list is rejected. This means that all objects in the change list can still be edited. In this situation, you can edit the object version that was already editable but not the active version. If the active version is displayed, the (Display/Change) button is not active.

Select Displayed Version

Selects the object version displayed for further editing.