1047
64%

Ran 20 Mar 2017 10:12PM UTC

Jobs 3

Files 53

Run time 11min

Badge

Embed ▾

pending completion

Build # 1047

Build Type

Pull #351

travis-ci

Committed by

web-flow

Commit Message

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

Pull Request Pull Request #351: fix: Invalid remote wins merge conflicts

Run Details

586 of 804 branches covered (72.89%)

3319 of 3608 relevant lines covered (91.99%)

34.7 hits per line

Jobs

ID	Job ID	Ran	Files	Coverage
1	1047.1 (DEFAULT_DELAY=50)	20 Mar 2017 10:12PM UTC	53	91.99	Travis Job 1047.1
2	1047.2 (DEFAULT_DELAY=50)	20 Mar 2017 10:16PM UTC	53	91.99	Travis Job 1047.2
3	1047.3 (DEFAULT_DELAY=50)	20 Mar 2017 10:21PM UTC	53	91.99	Travis Job 1047.3

Source Files on build 1047

Coverage	∆	File	Lines	Relevant	Covered	Missed	Hits/Line	Branch Hits	Branch Misses

deepstreamIO / deepstream.io-client-js / 1047
64%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 1047

deepstreamIO / deepstream.io-client-js / 1047 64%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 1047

deepstreamIO / deepstream.io-client-js / 1047
64%

README BADGES
x