Resolve Conflicts dialog

This dialog lets you resolve version control conflicts. You can scroll through the list of objects with conflicts and resolve conflicts for each object in turn.

The dialog is displayed by clicking OK on the message box that tell you conflicts have been found.

Show image

Item	Description
Conflict selection and refresh (buttons)	Previous object / Next object Scroll through the list of objects where conflicts have occurred. Select all Select all objects with conflicts. Refresh Update the count of objects with conflicts. You will need to do this periodically to keep track of how many objects remain with conflicts.
Commit (button)	For use when all conflicts have been resolved for all objects.
Object details	Conflict description, ID, object type, desired ID.
Conflict management (buttons)	Resolve conflict Click to use the value coloured green in the conflict details grid to resolve the conflict. Edit object Click to open the object's property sheet. You can make any changes you want. If you need to rename an object because of a duplicate ID you will have to do this via the property sheet. Delete my object Click if you have created a new object with the same ID as one created by another user, and you want to keep the other user's object and not yours. Find object Click to select and zoom in on the current object. Commit history Click to open the Commit History dialog for the currently selected object. In the Commit History dialog, you can view details of any previous commit, view differences between two versions as well as copy history to the clipboard. In particular, you can see the name of the user you are conflicting with.
Conflict details grid	Each row on the grid is a single conflict. Value coloured green The value that will be used if you click the Resolve conflict button. Which value is coloured green depends on the Keep your change checkbox. Keep your change Allows you to keep your change or discard it in favour of the Latest value currently in the master database.