shrinkwrap: suggest installing the merge driver (#20071)

PR-URL: #20071 Credit: @zkat Reviewed-By: @iarna
npm · Mar 23, 2018 · 5ebe997 · 5ebe997
1 parent 143cdbf
commit 5ebe997
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/install/read-shrinkwrap.js b/lib/install/read-shrinkwrap.js
@@ -69,6 +69,8 @@ function parsePkgLock (str, filename) {
   } catch (e) {
     if (isDiff(str)) {
       log.warn('conflict', `A git conflict was detected in ${filename}. Attempting to auto-resolve.`)
+      log.warn('conflict', 'To make this happen automatically on git rebase/merge, consider using the npm-merge-driver:')
+      log.warn('conflict', '$ npx npm-merge-driver install -g')
       const pieces = str.split(/[\n\r]+/g).reduce((acc, line) => {
         if (line.match(PARENT_RE)) acc.state = 'parent'
         else if (line.match(OURS_RE)) acc.state = 'ours'