Couchbase sync gateway server side conflict resolution

You can be notified of conflicts on the server side by using the changes speed with the conflicts parameter in the querystring http://developer.couchbase.com/documentation/mobile/1.1.0/develop/references/sync-gateway/rest-api/database/get-changes/index.html

Then, your app server resolves the conflict by creating a new revision with the desired properties and deleting all other non current revisions.

James