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

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

Build:
Build:
LAST BUILD BRANCH: refs/tags/v7.0.5
DEFAULT BRANCH: master
Ran 20 Mar 2017 10:29PM UTC
Jobs 2
Files 53
Run time 3min
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
1048

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

589 of 808 branches covered (72.9%)

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

3325 of 3615 relevant lines covered (91.98%)

23.23 hits per line

New Missed Lines in Diff

Lines Coverage ∆ File
2
100.0
src/record/record.js

Uncovered Existing Lines

Lines Coverage ∆ File
22
100.0
src/record/record.js
Jobs
ID Job ID Ran Files Coverage
1 1048.1 (DEFAULT_DELAY=50) 20 Mar 2017 10:29PM UTC 0
91.98
Travis Job 1048.1
2 1048.2 (DEFAULT_DELAY=50) 20 Mar 2017 10:32PM UTC 0
91.98
Travis Job 1048.2
Source Files on build 1048
Detailed source file information is not available for this build.
  • Back to Repo
  • Travis Build #1048
  • a2915c6f on github
  • Prev Build on remote-win-merge-conflict (#1046)
  • Next Build on remote-win-merge-conflict (#1050)
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