I have the same issue when using couchbaselite-phonegap-plugin(1.1 with SG 1.1,REST API). and at the same time, I also want to know, How should I do on the CBL side. I can accept the sync gateway's doc, but how should I do ?
a) delete the CBL's conflict doc and let sync gateway sync the doc again?
the deletion will tiger the sync back to sync gateway from CBL? the version of doc in CBL will increase?
b) Using the sync gateway's doc to update the CBL's doc?
the version of doc in CBL will increase? and this will cause other conflict(also if the doc's rev will generate by doc's value,but the rev will include 2 part,such as in CBL ,the rev is 3-f1f92da1ac57cb812b5352aca4272ff6 and in the sync gateway ,the rev is 5-f1f92da1ac57cb812b5352aca4272ff6)?