• Home
  • Features
  • Pricing
  • Docs
  • Announcements
  • Sign In

deepstreamIO / deepstream.io-client-js / 1046
92%
master: 64%

Build:
Build:
LAST BUILD BRANCH: refs/tags/v7.0.5
DEFAULT BRANCH: master
Ran 20 Mar 2017 09:59PM UTC
Jobs 3
Files 53
Run time 9min
Badge
Embed ▾
README BADGES
x

If you need to use a raster PNG badge, change the '.svg' to '.png' in the link

Markdown

Textile

RDoc

HTML

Rst

pending completion
1046

push

travis-ci

yasserf
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%)

79 of 79 new or added lines in 2 files covered. (100.0%)

3319 of 3608 relevant lines covered (91.99%)

35.08 hits per line

Jobs
ID Job ID Ran Files Coverage
1 1046.1 (DEFAULT_DELAY=50) 20 Mar 2017 09:59PM UTC 0
91.99
Travis Job 1046.1
2 1046.2 (DEFAULT_DELAY=50) 20 Mar 2017 10:04PM UTC 0
91.99
Travis Job 1046.2
3 1046.3 (DEFAULT_DELAY=50) 20 Mar 2017 10:09PM UTC 0
91.99
Travis Job 1046.3
Source Files on build 1046
Detailed source file information is not available for this build.
  • Back to Repo
  • Travis Build #1046
  • 7cb4ac9d on github
  • Next Build on remote-win-merge-conflict (#1048)
STATUS · Troubleshooting · Open an Issue · Sales · Support · CAREERS · ENTERPRISE · START FREE · SCHEDULE DEMO
ANNOUNCEMENTS · TWITTER · TOS & SLA · Supported CI Services · What's a CI service? · Automated Testing

© 2026 Coveralls, Inc