Resolve Update Conflicts Dialog

If conflicts occur when you get other users changes (often as part of the commit changes process), the operation will fail and you will see a message showing you how many objects have conflicts.

Click OK on the message. This displays the Resolve Update Conflicts dialog.

Resolve / Update Conflicts dialog

Example of Resolve 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 buttons along the top of the dialog allow you to work with all the conflicting objects:

All the information below the line represents the conflicts in the current object:

See Resolving Conflicts for more details.

Resolving Conflicts

Getting Other Users Changes

Committing Your Changes

Commit History Dialog