Getting npm conflict warnings with while npm-merge-driver is running


(Lars Willighagen) #1

What I Wanted to Do

Run git rebase after npx npm-merge-driver install --global without warnings.

What Happened Instead

I did get warnings:

npm-merge-driver: merging package-lock.json
npm WARN conflict A git conflict was detected in package-lock.json. Attempting to auto-resolve.
npm WARN conflict To make this happen automatically on git rebase/merge, consider using the npm-merge-driver:
npm WARN conflict $ npx npm-merge-driver install -g

Reproduction Steps

Not sure if this is reproducible, but I ran:

$ npm-merge-driver install --global

npx: installed 52 in 1.97s
npm-merge-driver: npm-merge-driver installed to `git config --global` and /home/larsgw/.config/git/attributes

$ git rebase
First, rewinding head to replay your work on top of it...
Applying: feat(view): add PackageSummary
Using index info to reconstruct a base tree...
M       package-lock.json
M       package.json
Falling back to patching base and 3-way merge...
npx: installed 52 in 2.483s
npm-merge-driver: merging package-lock.json
npm WARN conflict A git conflict was detected in package-lock.json. Attempting to auto-resolve.
npm WARN conflict To make this happen automatically on git rebase/merge, consider using the npm-merge-driver:
npm WARN conflict $ npx npm-merge-driver install -g
added 261 packages, removed 58 packages, updated 162 packages and audited 9644 packages in 17.628s
found 0 vulnerabilities

npm-merge-driver: package-lock.json successfully merged.
Auto-merging package.json
Auto-merging package-lock.json
...

Platform Info

$ npm --versions
{ tink: '0.21.4',
  npm: '6.7.0',
  ares: '1.15.0',
  cldr: '33.1',
  http_parser: '2.8.0',
  icu: '62.1',
  modules: '64',
  napi: '3',
  nghttp2: '1.34.0',
  node: '10.14.2',
  openssl: '1.1.0j',
  tz: '2018e',
  unicode: '11.0',
  uv: '1.23.2',
  v8: '6.8.275.32-node.45',
  zlib: '1.2.11' }
$ node -p process.platform
linux
$ npx npm-merge-driver -v
2.3.5

(Lars Willighagen) closed #2

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.