View Conflicts
If there are any conflicts, the View Conflicts button will appear in the Toolbar. This appears only if any issues occur.

In the following example there is a conflict for a document which has been updated both on the server and the local file system.
Schedule of Conflicts

If you simply click on the conflict and can then apply any of the resolutions that are open to you.
As you can see from the image above there is a whole range of functions are available including:
Copyright © 2009 Digilink Limited