See https://github.com/couchbase/couchbase-lite-C/issues/335 for more detail.
CBL-3611 Replicator does not retry conflict resolution for preexisting conflicted documents (Port for 3.0.x)
CBL-3610 Pending Conflict's C4DocumentEnded has incorrect flags and revID