Merge google docs document thats been modified by other client. (google drive sdk)

Question

Whats the preferred or best procedure to merge a google docs document, thats already been modified by another client through the Google Drive SDK?

In my case there will only be text-changes and no formatting differences.

Answer 1

Unfortunately, you will have to handle this conflict yourself. The API does help you, by providing an ETag, which the server uses test whether the file you are updating has been changed in the Google Drive. If it has been changed, the request will fail by default.