[waltsyd]

Change the merge behavior to "Prompt user for decision", and you'll see the differences MobileSheets is detecting that is causing the merging to occur.

Mike

When I do that, I get the same files showing up to be merged every time. The name, size, and date modified are identical. I select "Use mine" and apply to all subsequent merges. I run sync again and get the same behavior.

For a test, I deleted the first offending file off of the client and ran the sync again. Strangely, I still got the same decision prompt for the just-deleted file. My side showed the file name, size, and date. The client just showed the words "Do nothing". I don't understand how there could be a merge issue when the client file had been deleted. Anyway, I selected "Use mine" and the next time I ran the sync, that file no longer caused a merge issue.

I think I will have to delete the offending files off of the client manually and do the sync again. That could take a while. The other option would be to nuke all the 5000+ files on the client and sync from the server. What would you recommend?