Handle Conflict

Feature Description

When multiple editors are editing different versions of data, there may be instances where they edit the same data simultaneously. In this case, editing conflicts will occur between the versions, and the conflict resolution function will be needed to retain one editor's edit result.

Feature Entry

  • Data tab-> Manage Data Version group-> Handle Conflict.

Steps

When editing multiple versions of data simultaneously, the version that is updated and committed first will not prompt a conflict, while the later updated version will prompt a conflict. At this point, you can follow the instructions in the prompt dialog to enter the conflict resolution dialog. Taking the update of feature attributes as an example, the specific steps are as follows:

  1. In version V_1, update the attributes of the selected feature and change it to "Shrubland."
  2. Update and commit the data changes in version V_1.
  3. In version V_2, update the attributes of the selected feature and change it to "Orchard."
  4. Update the changes from version V_2 to the Default version, which will trigger a prompt like "Datasource 'localhost_landuse' update completed. Conflicting objects detected, do you want to resolve?" Click the "Yes" button to enter the conflict resolution dialog.
  5. In the conflict resolution dialog, click the "..." button in the Conflict Handling column to enter the detailed conflict resolution dialog.
  6. As shown in the figure below, select the option to retain the changes prior to the conflict in the "Retain Changes Before" dropdown under the "Retain Object" column in the conflict list.
  7. After the conflict is handled, click the OK button to complete the Handle Conflict.

Parameter Description

The Handle Conflict dialog box is described below:

  • The conflict list shows all conflicts, and specific conflict contents can be displayed in the two areas on the right by selecting a conflict. The Drop-down Button of the Keep Objects column provides: Keep Current, Keep Default, Reserve before change, Merge Current and Default, Merge Default and current。
    • Keep Current: means keep this version of Changed Content.
    • Keep Default: That is, keep the Changed Content of the previously committed version.
    • Reserve before change: means that the contents of this version and the previous version before the change are reserved.
    • Merge Current and Default: is to merge the contents changed in this version and the previous version, and retain the attribute Select Fields of the current version.
    • Merge Default and Current: Merge the content changed by this version and the previous version, and keep the attribute Select Fields of the Default version.
  • The Spatial Object Change area shows the contents before and after the change and the Default version.
  • The changed Property Field is highlighted in the Property Change area.

Related Topics

Version Control Overview

Version Control Basic Vocabulary

Register Version

Version Control

Switch Version

Commit Changes