Causes of conflicts
When you post a changeset, a conflict may arise for any of the following reasons:
•Different kinds of edits have been performed on the same component attribute in parallel in two or more changesets.
Example: Jane and Harry are both editing the same ID number of a pipe object in the network in their respective optimistic changesets. Harry then posts his changes. When Jane later post her changes, she is informed that the pipe was recently posted and that there are now three versions of the ID number on the line; the original, Harry's version, and Jane's own version. Jane selects the version that will be applied in the database by synchronizing the versions and posts her changeset again.
•Objects in the changeset to be posted are locked in another changeset.
Example: Harry is editing various objects in his optimistic changeset. When he posts it he is informed that one of the objects is locked. By showing the lock information for the object, he determines that it is Jane who has locked the object in a pessimistic changeset. Harry asks Jane (or an administrator) to unlock the object, and then posts the changeset again.
The Conflict Handling Dialog
Should a conflict arise when you post or when you convert an optimistic changeset, the dialog Conflict Handling is opened.
The dialog displays the different conflict component attribute versions (Conflicts tab) and/or any locking objects (Locked tab) that are causing the problem. Conflicting objects are presented in a tree view which can be expanded to display the member components for the object. Left-click to Expand Tree/Collapse tree to show or hide conflicting objects.
To resolve a conflict, your task is to select which version of the component attribute that is to be saved in the database, to synchronize the conflicting versions. It is possible to synchronize all object columns at a time, the whole object, or individual components.
|
|
||
Object type |
The object type containing the conflicting component(s). |
||
Field |
The attribute field containing the source of the conflict. |
||
Before your change (Previous) |
The original attribute version as it appeared before the conflict arose. This attribute version is not selectable. |
||
Currently posted |
The attribute as it appears in the database since the last posted conflicting modification. You can choose to synchronize the entire column, a whole object, or individual components. Select the corresponding column field, which is then highlighted in green. It is also possible to place temporary graphic that shows the modified component in the map and how it looks in the posted data. This makes it possible to compare with the new situation in your changeset. If you right-click on a row in the column for currently posted you will get the alternatives Show location, Show as text and Show change information. |
||
In this changeset (Current) |
The attribute as it appears in the user's current, unposted changeset. You can choose to synchronize the entire column, a whole object, or individual components by left-clicking the corresponding column field, which is then highlighted in green. |
||
Don't synchronize |
The conflict is not resolved. Unresolved conflicts remain in the current changeset and are again presented in the dialog the next time you choose to post the changeset. You can choose to synchronize the entire column, a whole object, or individual components by left-clicking the corresponding column field, which is then highlighted in red. |
||
Synchronize |
Apply the attribute selected version. Unresolved conflicts - Don't synchronize - remain unchanged. |
||
Post... |
|
||
Close |
Close the dialog. |
Handling a conflict
1.Select one of the options:
oCurrently posted - Selecting one of the currently posted attribute versions, colors the selected field green.
oIn this changeset
oDon't synchronize - Means that you do not handle the conflict at the moment. Selecting an unsynchronized attribute version, colors the field red.
2.Press Synchronize and handle conflicts. Synchronized attributes are removed from the table.
3.Press Post... To post the changeset. The handled conflict is saved to the database. Once posted, the changeset will be empty.
Handling locked objects when posting
1.Select the tab Locked.
2.Select an entry in the top table listing object locked by another changeset. Information about the User and Name of the changeset is now loaded in the lower table.
3.Contact the user and ask him or her to unlock the object by Undo, Post or Convert the changeset depending on which action that is the most appropriate.
4.Press Post... To post the changeset.