ER/Studio - Embarcadero Technologies Product Documentation

WORKING WITH THE REPOSITORY > WORKING WITH OBJECTS IN THE REPOSITORY
Resolving Check-in and Merge Conflicts
The following describes the logic behind conflict detection resolutions:
A conflict arises when there is a difference between the version in the Repository and the version checked out to
a user. In these instances, you can resolve the data conflict by choosing to accept your version, the Repository
version or a combination of both. A common scenario arises when multiple, simultaneous changes have been
made to a model. There are three general types of Repository conflicts:
• An item was updated in a local copy but deleted in the Repository version.
• An item was deleted in a local copy but updated in the Repository version.
• An item was updated in a local copy and was updated differently in the Repository version.
Conflicts of type 1 and 2: Have a check box, which if selected indicates that the local version will be applied.
(You can view the properties of the item or table updated in the local diagram by expanding the item. Only those
properties that have been updated will be displayed).
If you select the check box of this conflict item, Table A will be applied to the local and the Repository version of
the diagram; the table will not be deleted. However, if the user clears the check box, the remote version of the
diagram will be applied to the local version - the table will be deleted in the local version of the diagram.
A converse example: an item is deleted locally but updated in the Repository. You can view the properties and
the new table values (i.e. see how the table was updated by other users) by expanding the item. Only properties
whose values changed will be displayed. If you select the check box of the conflict item, the local version will be
applied - the table will be deleted in the local version and the Repository version of the diagram. If you do not
select the check box, the table will be updated in the local version of the diagram.
Conflicts of type 3: the Review Changes and Resolve Conflicts dialog box will display each new name
underneath the table conflict item. The first name property item (new name item) will display the local value for
the table name (i.e. the name decided upon by the local user). The second item will display the new value for the
table name as it appears in the Repository version of the diagram. Each item has an option button. If you click
the option button of the ER/Studio version of the table name, the local name version will be applied to the
Repository and the local ER/Studio version. If you select the Repository version, that name will go into effect in
the local version of the diagram (and stay in effect in the Repository).
Common check-in conflicts and their resolution are summarized in the table below.
Conflict Resolution
ER/Studio Repository
Unchanged Modified Soft, does not show up in dialog, chooses Repository side.
Unchanged Deleted Soft, does not show up in dialog, chooses Repository.
Unchanged Unchanged Not a conflict, does not show up in dialog.
Modified Unchanged Soft, shows up in dialog with Review Changes enabled, defaults to ER/Studio.
Deleted Unchanged Soft, shows up in dialog with Review Changes enabled, defaults to ER/Studio.
Modified Modified Hard, shows up in dialog, defaults to ER/Studio.
Modified Deleted Hard, show up in dialog, defaults to Repository.
Deleted Modified No conflict, shows up in dialog with Review Changes enabled, defaults to
ER/Studio
Does Not Exist New No conflict, does not show up in dialog, defaults to Repository.
New New Not indicated as conflicts in dialog and are resolved either by renaming one of
the objects in ER/Studio, or by deleting one of the objects or properties.
EMBARCADERO TECHNOLOGIES > ER/STUDIO® 8.0.3 USER GUIDE 284