Resolving Conflicts

A conflict can occur if two or more users make changes to the same fields in the same objects and this results in the fields being set to different values.

Conflicts can only occur when getting other users' changes when another user has already committed a different change to the same data. Bear in mind that getting other users' changes is the first stage in committing your own changes back to the master database, so conflicts will often occur as part of this process.

Commit changes regularly to reduce the possibility of conflicts and to keep other users up-to-date. You cannot save your own changes to the Master Database until you have successfully updated your local copy of the data with changes made by others, and resolved any conflicts that might arise. This means you have to choose to keep your own change, or discard it in favour of the change made by another user.

Conflicts can be difficult to resolve. Within InfoWorks ICM the process of choosing one value or another is relatively simple. However, within your organisation there will probably be phone-calls, e-mails and even meetings to decide why the conflict has arisen and which value is correct.

The best approach is to plan your work to minimise the chances of conflicts ever occurring:

How to Resolve Conflicts

If conflicts occur when you get other users' changes, your local database will be updated and you will see a message showing you how many objects have conflicts.

Conflicts Message

Example of warning message displayed when there are conflicts

  1. Click OK and you will see the Resolve Update Conflicts dialog. This dialog displays the conflicts for one object. You can scroll through the list of objects with conflicts and resolve conflicts for each object in turn. The object you are currently resolving is highlighted on the Grid Windows and GeoPlan.
  2. The buttons along the top of the dialog allow you to work with all the conflicting objects:
  3. All the information below the line represents the conflicts in the current object:
  4. When you are happy that the selections you have made to resolve all the conflicts for the current object, click the Resolve conflict button. This will apply the chosen values, mark the object as resolved, and move on automatically to the next object with conflicts.
  5. Once you have resolved all outstanding conflicts, you can click the Commit button. This will display the Commit Changes dialog and take you into the Committing Your Changes process.

Objects with the Same ID

If you have created (or renamed) an object so it has the same ID as an object added by another user you have three options:

Conflicts Involving Array Data

Some data , for example line or boundary geometry, is stored within the Master Database as arrays. When a conflict exists in this array data, the Resolve Update Conflicts dialog will show that there is a conflict, but it will not show which values differ. This is because of the way this array information is stored.

Example Scenarios

Here are some examples of possible conflicts and how they are dealt with by InfoWorks ICM. These examples may not come from your specific Innovyze software but the same principles apply.

The master network contains a manhole with ID 'M101' and the System Type field set to other. Two users User 1 and User 2 both download the latest version of the network.

Click on the images below to reveal the examples.

Closed 1

Closed 2

Closed 3

Closed 4

Closed 5

Managing Version Controlled Items

Committing Your Changes

Resolve Update Conflicts Dialog

Commit Changes Dialog