deepstreamIO / deepstream.io-client-js / 1046 / 2

92%

master: 64%

push

travis-ci

fix: Invalid remote wins merge conflicts

When the strategy is remote wins and the content is identical, we expect that
the server version number is taken and no actual merge conflict occurs

Fixes #224

586 of 804 branches covered (72.89%)

3319 of 3608 relevant lines covered (91.99%)

11.69 hits per line