Colligo Networks Technical Support

When two users make a change to the same document (e.g. one via the browser, another via Contributor), a conflict will be created during the synchronization of the change.  When this occurs, the Errors and Conflicts pane is opened and the conflict is displayed.  The conflict is also highlighted in the library where the file resides.  The user has the option to select which version (server or local) should become the new current version on the server.  If they select the server version, the local copy with their changes will be permanently deleted.  If the user selects the local version, it will be uploaded to the server on the next sync cycle and become the latest version.