Resolving Conflicts

In a 2-way sync task, a conflict occurs when the same file was changed in both location A and location B since the last run. SyncFolder can't know which version you want to keep. What it does is set with Conflict resolution in the advanced task settings:

• Keep both and report conflict (default) — nothing is overwritten; you decide on the Resolve Sync Conflicts page.
• Rename the older file and copy the newest — both versions are kept automatically.
• Overwrite the older file — the newest version wins automatically.

With the default setting, the task result ends with (needs attention!) and the Status page shows the button Resolve conflicts.

The Resolve Sync Conflicts Page

"Files and/or folders in both locations have been modified since the last sync. Choose how you want to resolve each conflict, then click Resolve."

Each conflict is one row. The left side shows location A, the right side location B:

The most recently modified version is highlighted, so you can see at a glance which one is newer.

How to Resolve

Inspecting a File

Click the Show more button next to a file to open a menu:

• Open / Open with... — open the file to compare its content.
• Show in folder — open the folder that contains the file in Explorer.
• Delete — delete this version. In the confirmation you can check Copy item first to the Windows recycle bin (if the storage device supports this).

Resolving

Click Resolve (Start synchronization as shown below in the 'action' column). The status shows Resolving conflicts and the Result column is filled in. The summary reads, for example, "5 conflicts copied." Click Cancel to stop, or Close to return to the Status page.

When Resolving Fails

Possible results per file: Source missing, Can't create folder, Copy failed, Insufficient space or Cancelled. If resolving fails as a whole, SyncFolder shows "The requested synchronization was not successful." — "Correct the error and go back to the Status page by closing the dialog. Then, reopen the Conflicts page by clicking the 'Resolve conflicts' button. Finally, try then to synchronize again."