
How Do You Fix OneDrive Sync Conflicts?
To fix OneDrive sync conflicts, find the duplicate file that carries your computer’s name, compare it with the original, merge the changes you need, then delete the extra copy. For Office files, OneDrive can offer to merge changes or keep both. To prevent repeats, let sync finish before closing your laptop and avoid editing offline.
| What you see | What it means | What to do |
|---|---|---|
Report-LAPTOP.docx next to Report.docx |
Same file changed on two devices | Compare, merge, delete the extra |
| “Sync conflict” message in Office | Office spotted two versions | Choose Merge changes or Keep both |
| Many files with the PC name | Sign-in or folder mix-up after relinking | Check you relinked to the same folder |
| Conflicts on the same file daily | An app edits it in the background | Move that file out of OneDrive |
What You Need Before You Start
- Both devices that edited the file, if possible.
- The OneDrive website open, to check version history.
- For Word files, the desktop Word app, which has a Compare tool.
Step 1: Find All Conflict Copies
OneDrive usually adds the device name to the copy it could not merge.
- Open your OneDrive folder in File Explorer.
- Search for your computer’s name. To find it, open Settings > System > About in Windows.
- Note each pair of files: the original and the one with the device name.
Step 2: Compare the Two Versions
Check modified dates and sizes first. Then open both files.
- Word: open the original, go to Review > Compare > Compare, and select the conflict copy. Word shows every difference.
- Excel: open both side by side with View > View Side by Side.
- Other files: open both and check which has the changes you need.
Step 3: Merge and Keep One File
- Copy the changes you need into the original file.
- Save the original.
- Delete the conflict copy.
- Wait for OneDrive to sync the result.
If you are unsure, keep both for a day. Nothing is lost while both exist.
Still stuck after these steps?
Send us the exact error message or a description of what you see. We use every request to write or update a fix.
Step 4: Use Office’s Merge Option
When OneDrive syncs Office files through the Office apps, a conflict can show a message in Word, Excel or PowerPoint. You may see options such as Merge changes or Keep both.
- Merge changes combines edits into one file. This works best for Word and PowerPoint.
- Keep both saves a second copy so you can compare later.
The setting that lets Office handle this lives in OneDrive’s settings, under the option to use Office applications to sync Office files you open. Leave it on if you work with Office files across devices.
Step 5: Restore an Earlier Version If Needed
If the merged file looks wrong, roll it back. On onedrive.com, right-click the file and choose Version history. Microsoft keeps version history for 30 days. Our guide to OneDrive version history shows each step.
Step 6: Stop OneDrive Sync Conflicts Returning
- Let sync finish before closing the laptop lid. Wait for the plain cloud icon.
- Work online with shared files. Open them from OneDrive or the browser so co-authoring merges edits live.
- Keep clocks correct. Set Windows to set the time automatically.
- Do not run two sync apps on one folder. Keep Google Drive or Dropbox in their own folders.
- Move background-changing files out. App data and databases cause daily conflicts.
How to Verify the Conflict Is Gone
- Only one copy of the file remains in the folder and on onedrive.com.
- The file opens with all expected changes.
- No new copy with the PC name appears after the next edit.
Common Mistakes
- Deleting the original instead of the copy. Check dates first.
- Relinking to a new folder. That creates mass duplicates, which look like conflicts.
- Editing offline on two devices. This is the most common cause we see.
For the bigger picture, read our guide to sync conflicts across all apps. If conflicts come with error codes, see OneDrive sync issues, and if files stop syncing altogether, use our OneDrive not syncing checklist.
Frequently Asked Questions
Why does OneDrive add my computer name to files?
OneDrive adds the device name when it finds two different versions of a file and cannot merge them. Rather than overwrite one, it keeps both and renames the copy from your device. Compare the two files, merge the changes you need, and delete the extra copy.
Is it safe to delete OneDrive files with my PC name?
Yes, once you have checked their contents. Open the copy and the original, compare dates and changes, and move anything you need into the original. Then delete the copy. If you delete the wrong file, restore it from the OneDrive recycle bin or version history on onedrive.com.
Can OneDrive merge conflicting Office files automatically?
Often, yes. When Office apps handle sync for files you open, Word, Excel and PowerPoint can co-author and merge edits. If a true conflict occurs, Office may ask whether to merge changes or keep both. Other file types cannot be merged automatically, so OneDrive keeps both copies.
Why do I get OneDrive conflicts after reinstalling?
When you relink OneDrive, choosing a different folder location makes OneDrive download everything again next to your old files. It can then treat matching files as conflicts or duplicates. Relink to the original folder so OneDrive matches files, or carefully remove the duplicated folder after confirming the cloud copy.
How do I prevent OneDrive sync conflicts with shared files?
Open shared Office files directly from OneDrive or in the browser so edits merge in real time. Avoid downloading a copy and emailing it back. For other file types, agree that one person edits at a time, and let sync finish before closing the file on any device.
Keep your files safe and in sync
Join the newsletter for the free troubleshooting checklist and outage alerts. Facing a specific error? Tell us about it and we will point you to the right fix.
Sources
