couchbase / couchbase-lite-ios / 444

77%

master: 75%

Pull #2503

travis-ci

Make conflict resolution concurrent and defer stopped until done

* Brought the logic that makes the conflict resolution run concurrently
* Deferred stopped until the conflict resolution is done
* Refactored updateStatusProperties to use rawStatus to update and post

131 of 131 new or added lines in 1 file covered. (100.0%)

6460 of 8355 relevant lines covered (77.32%)

1043.01 hits per line