You edit a file in OneDrive on your laptop. You edit the same file in the OneDrive app on your phone. Both devices upload at the same time. OneDrive cannot decide which version is correct, so it creates two files: one named Document.docx and another named Document conflicted copy.docx. Your document is now in two places and you have lost work. Sync conflicts are avoidable with one simple rule: do not edit the same file from two devices simultaneously.
Cloud storage services (OneDrive, Google Drive, Dropbox, iCloud) are powerful, but they have a blind spot: they cannot know which edit is “correct” when two devices change the same file at the same time. This is the hardest problem in distributed systems. The solution is not to let it happen in the first place.
Why Sync Conflicts Happen and How to Spot Them
A sync conflict occurs when: (1) Device A edits Document.docx and uploads. (2) Device B edits Document.docx offline or simultaneously and uploads before seeing Device A’s changes. (3) The cloud service detects two different versions and cannot merge them.
OneDrive, Google Drive, and Dropbox all handle this the same way: they keep both copies. One is the “winning” copy (usually the one uploaded first or from the device with priority). The other is renamed with a suffix like “conflicted copy” or “_conflict_resolution”.
Spotting a conflict: Look in your cloud storage folder on your computer. If you see a file named “Document conflicted copy (2).docx” alongside “Document.docx”, a sync conflict occurred. Both files are real. Both contain different edits. You have lost work from one device.
Check the timestamps. “Document.docx” was last edited at 2 PM. “Document conflicted copy” was last edited at 2:15 PM. The conflicted copy is the newer version, but the cloud kept the older one. You need to manually merge them or delete the older version.
Preventing Sync Conflicts: The One Rule
The rule: Do not edit the same file from two devices at the same time. If you are working on Document.docx on your laptop, do not also open it on your phone at the same time. Close it on one device before opening it on another.
This is hard to enforce if you use multiple devices, but the cost of not enforcing it is permanent data loss. A 10-second wait to close a file on Device A before opening it on Device B is cheaper than losing 30 minutes of edits.
Most sync services have a solution: offline-first apps. Microsoft Word, Google Docs, and Apple Pages detect when you have unsync changes and delay uploads until you close the document. But this only works if you are using the company’s own app (Word for OneDrive, Docs for Google Drive). If you edit a docx file in a third-party app while another device is also editing it, the conflict occurs.
The corollary: Use the same app on all devices. Do not edit an Excel file in LibreOffice on your Mac and then in Excel on your PC. Excel and LibreOffice have different formatting and save structures, and the cloud sees them as conflict-worthy changes.
Recovering From Sync Conflicts: Merging or Discarding
When a conflict happens, you have two files and need to pick one or merge them. If the conflicted copy contains work you need, open it, copy the new edits, and paste them into the main file. Then delete the conflicted copy. If the conflicted copy is just an old version, delete it immediately.
Google Drive and Dropbox have built-in version history. Right-click a file and select Version History. You can see every edit, who made it, and when. Restore an older version if needed. OneDrive version history is hidden in the web interface at onedrive.live.com. Click a file and select “Version History” from the top menu.
For critical files (tax records, contracts, code repositories), use git instead of cloud storage. Git was built to merge conflicting edits and is far more powerful than any cloud service sync.
Advanced Prevention: Shared Folders and Permissions
OneDrive and Google Drive both support shared files. When you share a file with a colleague, you are both editing the same file. The cloud service can see this and handles conflicts better—it often detects that the same file is open in two places and locks one of them temporarily. But this only works if you are using their native editors (Word Online, Google Docs). If you download a shared file and edit it offline, you are back to conflict risk.
Set file permissions to reduce accidental edits. Make some folders read-only on your phone so you cannot accidentally modify files there. Use shared links with “View Only” permission for files that should never be edited, only read.
Check OneDrive sync documentation. Visit our tips homepage for more storage and backup guides. Related: email filtering and organization and USB-C charger troubleshooting.
Start today: close files before switching devices. This one habit prevents 99% of sync conflicts.