When master version updates on a DoneUploads, with a conflicting file version, what happens on client?

[crspybits]

I'm not sure how well the client is currently handling the following scenario:

1. A DoneUploads is carried out,
2. It fails with a masterVersion update
3. A file was being uploaded as part of the DoneUploads and another user had already committed a version update to that file-- so the file needs to be re-uploaded.

I.e., this is a conflict scenario because the local client was trying to upload version N of the file and the file has already been uploaded as version N or higher.

a) Does the conflict get passed on to the client app using the iOSClient?
b) Assuming the conflict is resolved in favor of another upload, does that upload get retried along with a repeated DoneUploads attempt? And with an updated file version?