[MacBerry]

Thanks Lizard.

Renaming the iDisk copy, uploading from the desktop, then syncing again fixed it. This was all before the Conflict resolver messages in the other thread, and I wondered if this error could have been part of the issue.

I definately didn't touch any copy of the file before getting this error, so the biggest worry was why the files changed at all.