FreeFileSync

FreeFileSyncWindows synchronization guide

FreeFileSync Two-Way Conflict Example: What Happens to Edits?

Quick answer

If the same file changes independently on both sides since the previous sync, preserve both copies and inspect the conflict rather than guessing which edit should win.

FreeFileSync.app Editorial Team · Updated October 28, 2026 · Windows 10 and Windows 11

Create a safe reproduction

Use disposable copies of the same sample document in two test folders and run an initial Two Way sync.

Modify both sides

Edit each copy differently and preview the next comparison. Do not run the plan automatically.

Resolve based on content

Open both versions and decide whether to keep one or merge their changes, preserving the originals until confirmed.

Check synchronization history

If the database is missing or the folder pair changed, review the full operation list because conflict detection may differ.

Before you run the job

Use disposable test folders for the first pass. Keep an independent copy of important files, confirm drive identities, and run Compare before Synchronize. A preview is not a substitute for checking the actual destination afterwards.

Related FreeFileSync Windows guides

Source and review notes

This guide explains a focused Windows workflow. Consult the current FreeFileSync developer manual for precise behavior and edition-specific options. Review each planned file operation and test with non-critical files before relying on a procedure.