Merge a Google documentation document that has been modified by another client. (google drive sdk)

Question

What is the preferred or best procedure for combining a Google Docs document that has already been edited by another client using the Google Drive SDK?

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

Answer 1

Unfortunately, you will have to deal with this conflict yourself. The API will help you by providing the ETag, which the server uses to check whether the modified file has been modified in Google Drive. If it has been modified, the default request will not be executed.