A conflict can occur when multiple people make changes to the same file without those changes being synced first. This often happens in shared folders, especially when two people open and edit a file like a Microsoft Word document at the same time using the desktop app. Since both versions are being saved independently, Sync recognizes this and logs each one separately to prevent data loss. The original file is preserved, and a second version is created with the same name, appended with “conflict.” This way, Sync ensures that no one’s work is accidentally overwritten and all changes are retained.
This article will cover the following:
How to resolve conflict file copies:
The most effective way to resolve a conflicted copy in Sync is to manually review and merge the differences between both versions.
Conflicted copies can occur with any file type. If you're working with Microsoft Word documents, refer to Microsoft’s support article for detailed instructions on comparing and merging versions.
How can conflicted copies be prevented?
A simple way to prevent a conflict is to move the file out of the Sync folder when working on it. Doing this causes the file to appear as deleted and doesn't allow other users to edit the file. Once done, simply move the file back into its original location in the Sync folder and the new version will appear on everyone's account.