Troubleshooting guide
Nextcloud Two-Way Sync Test: When Conflict Files Appear Instead of Merging
Category: File Sync
You edited a file on your Windows PC and another user edited the same file on the server, and now the desktop client keeps producing conflict copies instead of keeping the intended version.
Check the conflict pattern first
Open the folder in File Explorer and look at the conflict files. If each conflict copy contains only one side’s edits, the client is doing its job: it cannot merge overlapping changes, so it preserves both. That is expected behavior, not a sync failure. If the conflict copies are empty or identical to the original, the client may be misreading timestamps or the file may be locked by another program.
Run a controlled two-way sync test
Create a small test folder and a plain text file inside it. Let it sync fully. Then edit the file on the PC, wait for the green check, edit the same line on the server, and wait for the client to detect the change. This nextcloud two way sync test shows whether the client reports a conflict only when edits truly overlap. If it conflicts on non-overlapping edits, check the client log for timestamp or ETag warnings and confirm the server clock is correct.
Verify and recover
After the test, open the conflict file and compare line by line. Merge the intended content manually, save, and let it sync. Delete the conflict copy only after confirming the merged file is correct. If you need the previous state, restore the file from the server’s version history before deleting anything.
If conflicts persist on non-overlapping edits,

Ask for help with the client log and the test folder details.