OneDrive Sync Conflict: Which Version Should You Keep? (2026)

Quick answer

When OneDrive or SharePoint produces a sync conflict file — typically with -DESKTOP-XYZ or (your name's conflicted copy) appended to the filename — the safe move is not to keep the most recent one and delete the other. Conflict files exist precisely because OneDrive doesn’t know which version is correct, and “most recent” is often wrong. The right answer depends on which device made which change, when each was online, and whether the changes are mergeable. Open both versions, compare them, and only then decide.

This guide is a decision tree to walk you through that comparison.

Before you start

Make a copy of both versions before you do anything else. Drag both files to a separate folder labeled “conflict-resolution” so you have working copies that won’t get touched while you investigate. If you delete the wrong version and OneDrive syncs the deletion, version history may save you — but only if you act quickly.

If the conflict involves an Office document (Word, Excel, PowerPoint), open each copy in its app and check the document’s metadata via File → Info. The “Last modified” timestamp shown there is the content edit time, which is more reliable than the file-system timestamp shown in Explorer (Explorer’s “Date modified” can change when a file is synced, even if the content didn’t change).

What a sync conflict actually is

A sync conflict happens when OneDrive (or SharePoint, or any cloud-sync product) sees two different changes to the same file from two different sources, and can’t determine which should win. The most common scenarios:

  • You edited a file on your laptop while offline, made changes from your phone or another device, then your laptop reconnected.
  • Two people edited the same file in a shared folder before either change had synced.
  • A network interruption during save left the local copy and the server copy out of step.
  • A device sat in sleep with unsaved changes for long enough that the server version had moved on.

When OneDrive detects this, it doesn’t pick a winner. It keeps both, names one of them with a conflict suffix, and surfaces a notification (which most people don’t see, because OneDrive notifications are easy to miss). You then have to decide.

The standard conflict-file naming convention is:

  • Filename-DEVICE-NAME.xlsx — older format, typically used by classic OneDrive sync
  • Filename (your-name's conflicted copy yyyy-mm-dd).xlsx — newer format, sometimes used by SharePoint and Teams sync
  • Filename (1).xlsx, Filename (2).xlsx — generic conflict naming, sometimes seen

The presence of any of these alongside the original file is the signal that you have a conflict to resolve.

What “most recent” actually means (and why you can’t trust it)

The instinct most people have is to look at the timestamps and keep the newest file. This is wrong often enough that it’s worth understanding why.

In a sync conflict, both files are recent — that’s why there’s a conflict in the first place. The question isn’t “which was edited last” but “which has the changes that should survive.” Those are different questions when:

  • Two people edited the same file at the same time. The one who saved second wins on timestamp but may have overwritten substantive work from the other.
  • A device was offline for hours, then synced. Its changes are recent in absolute time but may have been made before the user saw a colleague’s changes from earlier in the day.
  • A device’s clock is wrong. This sounds rare but is common on phones that have switched time zones, on systems where the BIOS clock has drifted, and on virtual machines.
  • One side has more changes; the other has more recent changes. You probably want the one with more changes.

The real question is which set of changes you want to keep. Sometimes that’s both, in which case you merge.

The decision tree

You have File.xlsx and File-CONFLICT.xlsx (or similar).
│
Step 1: Open both in their respective apps. Compare them visually.
│
├── Are they identical?
│   └── Yes → A false-positive conflict. Keep one, delete the other. Stop.
│
├── Does one contain a strict superset of the other's changes?
│   └── Yes → Keep the superset. Delete the other. Stop.
│
├── Do they have different changes that don't overlap?
│   └── Yes → Merge. (Step 2)
│
└── Do they have conflicting changes to the same content?
    │
    Step 3: Diagnose which version reflects the intended work.
    │
    ├── Was one edited by someone with more authority on this content?
    │   └── Yes → Default to that one, but verify
    │
    ├── Did one device have a known issue (offline, crashed, time-zone-confused)?
    │   └── Use the version from the unaffected device
    │
    └── Genuinely uncertain → Keep both. Ask the other editor. Don't delete yet.

Step 1 — Visual diff before anything else

Both files open. Both visible. Look at them side by side, not at the file metadata.

For Word: enable Track Changes on a copy and use Compare Documents (Review → Compare → Compare). It produces a unified document showing every difference between the two versions. This is the fastest way to see exactly what’s different.

For Excel: there’s no built-in Compare for two files unless you have a Microsoft 365 Apps for Enterprise license, which includes Spreadsheet Compare in the Office Tools group. If you don’t, the manual approach is to open both files side by side and check the changed sheets cell by cell. For large workbooks, paste each sheet into a third workbook and use a formula like =IF(A1<>OtherSheet!A1, "DIFF", "") to highlight differences.

For PowerPoint: there’s a native Compare feature under Review → Compare. It works similarly to Word’s.

For non-Office files (text, PDFs, images): use a diff tool (Beyond Compare, WinMerge, free options) or, for PDFs, Adobe Acrobat Pro’s compare function.

The point of this step is to understand what is different, before you make any decision about which version is canonical.

Step 2 — Merge if the changes don’t conflict

If the differences are in different parts of the file (Person A added rows 50-100 in Sheet1; Person B added a new sheet), the right answer is to merge: take the union of the two sets of changes into a single file. This is more work than picking one, but it’s the right call when both sets of changes are valid.

For Office documents, the easiest merge path is:

  1. Pick one file as the base.
  2. Open the other.
  3. Manually copy the unique-to-it changes into the base.
  4. Save the merged base. Delete or archive both originals.

This sounds tedious because it is. But sync conflicts are precisely the situation where two valid sets of work exist; throwing one away is the worst answer when both can be kept.

If the conflict is in OneDrive or SharePoint and you have access to the file’s version history, you can sometimes use the history to merge — by rolling back, then re-applying changes from each conflict copy in sequence. The walkthrough is in Restore a previous version of an Office document.

Step 3 — Diagnose when changes conflict

If two versions edit the same content differently, you have to pick. The diagnostic signals that help:

Look at the device names in the conflict suffix. OneDrive’s conflict naming usually includes the device name. Budget-LAPTOP-WORK.xlsx versus Budget-LAPTOP-HOME.xlsx tells you which physical machine made each change. If you know one of those devices was offline, sleeping, or otherwise unreliable, that’s a strong signal.

Check the file’s content-edit timestamp inside the document. For Office files, File → Info shows “Last modified by” and the timestamp at the time of last save. The Explorer “Date modified” can be wrong (especially after a sync); the in-document timestamp is more reliable.

Look at the version history on the cloud side. OneDrive and SharePoint store version history for the server version. Often, one of your conflict files matches a version in that history (usually the one that successfully synced before the conflict was detected). The other is the local-only version that lost the merge race. If you don’t know who edited what when, version history fills in the timeline.

Ask the other person. If multiple people share the file, the fastest way to decide is often to ask the other editor what their version contains. This is unglamorous advice and tends to be skipped by guides that prefer to feel technical, but in practice it resolves conflicts in seconds.

Check the OneDrive sync queue. If sync is still completing, one of your “conflict” files may not actually be a conflict yet — it may be a local file that hasn’t finished uploading. See OneDrive sync pending forever for sync-state diagnostics; resolving the sync first sometimes resolves the apparent conflict.

When to keep both

Sometimes neither version is wrong, and merging isn’t practical. In that case, keep both, and rename one to something descriptive. Don’t leave files named with conflict suffixes — those names are meaningless three weeks from now. Rename them to Budget-Q4-laptop-work-version.xlsx and Budget-Q4-laptop-home-version.xlsx (or whatever describes them) so future-you knows what they are.

For team collaboration on shared files, keep-both is also the right answer when authority is unclear. The cost of keeping a redundant file for a week while you confirm with a colleague is far lower than the cost of deleting their work.

Preventing future sync conflicts

The honest answer here: sync conflicts mostly come from working offline on a file that’s also being edited elsewhere. The structural fixes are:

  • Use the web app or Office for the web for shared documents. When two or more people edit a OneDrive/SharePoint Word, Excel, or PowerPoint file in the browser (or in the desktop apps with co-authoring enabled), there are no conflicts — changes merge in real time.
  • Make sure AutoSave is on for files in OneDrive and SharePoint. AutoSave commits changes to the cloud copy continuously. The conflict scenario almost requires AutoSave to be off.
  • Don’t use OneDrive Files On-Demand on critical documents you edit offline. Files On-Demand fetches files when opened; the offline behavior is more conflict-prone than for files marked “always keep on this device.”
  • Wait for sync to finish before sleeping or shutting down a laptop. The OneDrive icon in the system tray shows sync state. A blue cloud icon with arrows means sync is in progress. Closing the lid mid-sync is a common cause of conflicts.

If you are on a work or school device

For files in OneDrive for Business or SharePoint, your IT team has tools the user doesn’t:

  • Site Collection Recycle Bin holds deleted versions for an additional 90 days beyond the user-facing 30, accessible by site collection administrators. If you’ve already deleted a conflict file you needed, it may still be recoverable.
  • Tenant-level retention policies can preserve files (and prior versions) for years, regardless of user-side deletion. Worth asking before assuming a file is gone.
  • Sensitivity-labeled files (Microsoft Information Protection) can produce strange-looking conflicts where the encryption envelope syncs but the content doesn’t. These need IT involvement.
  • Co-authoring is sometimes blocked by policy for files containing classified data; if your organization has disabled it, you’ll see more conflicts than you would otherwise. Talk to IT about the policy and whether browser-based editing might be enabled as an alternative.

When to stop

Stop and ask for help if:

  • The conflict involves a financial-period close, a legal document, or any record where the wrong version surviving has compliance implications.
  • You’ve already deleted one version and the remaining version is missing changes you needed — see Recover a deleted OneDrive file for the recovery options.
  • The conflict involves a file edited by more than two people. Multi-party conflicts get exponentially harder to merge cleanly; a coordinated conversation with everyone involved beats trying to reconstruct the timeline alone.
  • Multiple conflict files have appeared on the same document over a short period. That’s a sync configuration problem, not a conflict-resolution problem; the underlying sync issue needs fixing first.

Official references

Frequently asked questions

What does the device name in a OneDrive conflict filename mean? OneDrive appends the name of the device that produced the conflicting version. Filename-LAPTOP-AB12CD3.xlsx is the version from a device whose Windows name is LAPTOP-AB12CD3. You can find your own device’s name in Settings → System → About. If you see a device name you don’t recognize, the conflict came from another machine signed into the same OneDrive account, or from a colleague’s machine if the file is in a shared folder.

Can I just keep the newest conflict file and delete the others? You can, but you shouldn’t do it without checking. “Newest” by timestamp does not mean “contains the work you want.” If both versions diverged from a common ancestor, “newest” is just whichever device finished saving last — the older one might contain hours of work that the newer one overwrote. Always compare contents before deleting.

My OneDrive folder has dozens of conflict files. What should I do? That’s a sync configuration issue, not a one-off conflict. Pause OneDrive sync, copy the entire folder to a safe location, then check whether OneDrive is set up correctly: that AutoSave is on for Office files, that Files On-Demand isn’t being toggled mid-edit, that two devices aren’t both heavily editing offline. The Microsoft support article on resolving OneDrive sync issues (linked above) covers the diagnostic walkthrough.

Will OneDrive merge two conflict files automatically if I leave them alone? No. OneDrive specifically does not merge content; that’s exactly why it produced a conflict file rather than picking a winner. Co-authoring (real-time multi-user editing) merges automatically because everyone sees changes as they happen. Conflict files exist precisely because that real-time merge wasn’t possible — usually because someone was offline.

Is there a tool that compares two Excel files automatically? Microsoft 365 Apps for Enterprise includes Spreadsheet Compare under Office Tools. It does cell-by-cell comparison of two workbooks and produces a colored difference report. Standard consumer M365 plans do not include it. For users without it, the manual approach (paste each sheet into a third workbook with IF(A1<>OtherSheet!A1) formulas) is functional but tedious; commercial third-party diff tools also exist, though for a one-off conflict the manual route is usually faster than installing a tool.

↑ Back to top