Merge Conflicts Appear After Offline Editing: OneDrive for Business Fix

You edit a file offline, reconnect to the internet, and then see multiple copies of the same file with names like Document (Version 1).docx. This is a merge conflict caused by OneDrive’s sync engine detecting changes made on two separate copies of the same file. The conflict arises because OneDrive cannot automatically merge edits made offline with the version stored in the cloud. This article explains why merge conflicts occur after offline editing and provides a step-by-step method to resolve and prevent them.

Merge conflicts appear when you or another user modify the same file in two different locations at the same time. OneDrive creates separate copies to prevent data loss, but this clutters your folder and requires manual cleanup. You will learn how to identify the source of the conflict, merge changes safely, and adjust your sync settings to reduce future conflicts.

By following the instructions below, you can restore your folder to a single clean file and avoid losing any edits. The fix involves using OneDrive’s built-in conflict resolution tools and adjusting your offline file settings.

Why OneDrive Creates Merge Conflicts After Offline Editing

OneDrive for Business uses a sync engine that compares the local file timestamp and content hash with the cloud version. When you edit a file offline, the local version changes but the cloud version remains unchanged. After you reconnect, OneDrive sees two different versions of the same file. Because it cannot determine which version is authoritative, it creates a new copy with a version number in the filename. This is a safety measure to prevent overwriting either version.

Merge conflicts occur most often when:

• You edit a file on a mobile device while the desktop version is open and unsaved.
• You work offline on a laptop and another user edits the same file in the browser.
• You use the OneDrive desktop app with Files On-Demand disabled, causing all files to download and become editable locally.

OneDrive does not have a built-in merge tool for Office files like Word or Excel. It relies on the Office desktop apps to handle conflicts. If the Office app is not installed or the file type is not supported, OneDrive creates duplicate files. The only exception is when both edits are made in the same Office app while online — in that case, Office’s co-authoring feature merges changes automatically.

Steps to Resolve Merge Conflicts and Restore a Single File

1. Identify the conflicting files
   Open File Explorer and navigate to your OneDrive folder. Look for files with names like Filename (Version 1).ext or Filename (Conflicted copy).ext. These are the duplicate files created by the conflict. Note the original file name and the date modified for each copy.
2. Open both versions in the same app
   Double-click the original file and the conflicted copy to open them in the appropriate Office app (Word, Excel, PowerPoint). If the file is not an Office type, open both in a text editor like Notepad.
3. Compare and merge changes manually
   In the Office app, go to the Review tab and click Compare (Word) or Track Changes (Excel). Select the original file and the conflicted copy. Review each change and accept or reject them. If the file is plain text, copy the content from the conflicted copy and paste it into the original at the correct location.
4. Save the merged file with the original name
   After merging, save the file with the original name. Close the conflicted copy without saving. OneDrive will sync the merged version to the cloud.
5. Delete the duplicate file
   Right-click the conflicted copy in File Explorer and select Delete. Then empty the Recycle Bin. OneDrive will remove the duplicate from the cloud as well.

If You Cannot Open the Conflicted Copy

If the conflicted copy shows a red X or a sync error, first pause and resume OneDrive sync. Right-click the OneDrive icon in the system tray, select Pause syncing, choose a duration, then right-click again and select Resume syncing. This forces OneDrive to re-evaluate the file status. Then repeat the steps above.

Using OneDrive Version History as an Alternative

If you cannot open the conflicted copy or prefer not to merge manually, use version history in OneDrive for web. Open a browser, go to onedrive.com, sign in with your work or school account, and locate the original file. Click the file and select Version history. A panel opens showing all saved versions. Click the three dots next to the version that matches your offline edit and select Restore. This replaces the current cloud version with the offline version. Then delete the conflicted copy from File Explorer.

If Merge Conflicts Keep Recurring

OneDrive Creates a New Conflicted Copy Every Time I Sync

This usually happens when a file is open in an Office app while OneDrive tries to sync. Close all Office apps before syncing. Also check if the file is marked as Always keep on this device. Right-click the file in File Explorer, select Free up space to change it to online-only. Online-only files do not create local copies, so offline editing is not possible without intentionally making the file available offline.

Conflicts Appear on Files I Did Not Edit

Another user may have edited the same file while you were offline. OneDrive does not distinguish between your edits and another user’s edits. To prevent this, communicate with your team about who is editing which file. You can also use the Check out feature in SharePoint document libraries to lock a file while you edit it. Check out is available only for files stored in SharePoint or Teams, not for personal OneDrive folders.

Conflicts Appear for Non-Office Files Like PDF or Images

OneDrive cannot merge non-Office files. The only way to resolve this is to manually compare the two versions and choose which one to keep. Open both files side by side, note the differences, and decide which version is more complete. Then delete the other. To avoid this in the future, avoid editing non-Office files while offline unless you are the only person who accesses them.

Files On-Demand vs Always Keep on This Device: Key Differences

Item	Files On-Demand (Online-Only)	Always Keep on This Device
Description	Files appear in File Explorer but are stored only in the cloud until you open them	Files are downloaded and stored locally, taking up disk space
Offline editing	Not possible unless you right-click and select Always keep on this device	Possible; files are fully available offline
Merge conflict risk	Low; you must intentionally make a file available offline	High; any offline edit can cause a conflict if the cloud version changes
Storage space	Minimal local usage; only thumbnails and metadata	Full file size used locally

You can now resolve merge conflicts by manually comparing and merging the duplicate copies. To reduce future conflicts, set your OneDrive to use Files On-Demand and only mark files as always available offline when necessary. As an advanced tip, enable the Co-authoring setting in your Office apps by going to File > Options > Save and checking AutoSave OneDrive and SharePoint files by default. This allows multiple users to edit the same file simultaneously without creating conflicts.