> On Apr 30, 2015, at 4:49 AM, Jeremy Kelley <[email protected]> wrote: > > http://developer.couchbase.com/mobile/develop/guides/couchbase-lite/native-api/document/index.html > > <http://developer.couchbase.com/mobile/develop/guides/couchbase-lite/native-api/document/index.html> > > The "resolving conflicts" section here is what I'm talking about.
Resolving a conflict simply consists of deleting the conflicting revisions you don't want, and either keeping the remaining one or replacing it with a new revision containing the merged data. So in the REST API it's just some DELETE and PUT calls. The CouchDB documentation <http://docs.couchdb.org/en/latest/replication/conflicts.html#working-with-conflicting-documents> describes how to do it (all of this should be applicable to SG.) —Jens -- You received this message because you are subscribed to the Google Groups "Couchbase Mobile" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/mobile-couchbase/93B4CD90-09B2-42D0-85C2-DEB6F551E028%40couchbase.com. For more options, visit https://groups.google.com/d/optout.
