Resolving a sync conflict
A conflict happens when the same file changes in two places before either change has synced — usually because a computer was offline, or two people edited at once.
Sync never picks a winner silently. Both versions are kept and the file is listed under Conflicts until you decide.
Your options
- Keep both — the other version is saved alongside yours with the device name appended. Safest when you are not sure.
- Keep mine — the version on this computer wins.
- Keep theirs — the version from the other computer wins.
Delete-edit conflicts
If a file was deleted on one computer and edited on another, the edit is preserved as a conflict copy rather than being thrown away. You then decide whether the deletion or the edit was intended.
Avoiding them
Let a computer finish syncing before you start working on it, especially after it has been asleep or offline. For files that several people edit at once, a shared document tool is a better fit than folder sync.