Conflict Documents
Applies to: SharePoint Workspace 2010 | Visual Studio 2008
When two users make edits that are in conflict, a conflict document will be generated. For example, this can happen when an offline user edits a document and an online user edits the same document. The online user makes changes and the file is updated. When the offline user comes back online later, their file updates will be preserved in a conflict document. Note: When designing your applications, it is important to understand that the GrooveFilesBase64 Web Service does not differentiate between a conflict document and any other document, so there is not a robust way of reconciling conflicts programmatically. Conflicts should be resolved by users through the user interface.