git - 自动 merge package-lock.json

Question

git merge --no-ff account-creation

自动 merge package-lock.json冲突(内容):package-lock.json 中的 merge 冲突自动 merge 失败；修复冲突，然后提交结果。

关于这个问题有什么想法吗？

Answer 1

根据 docs :

Resolving lockfile conflicts

Occasionally, two separate npm install will create package locks thatcause merge conflicts in source control systems. As of npm@5.7.0,these conflicts can be resolved by manually fixing any package.jsonconflicts, and then running npm install [--package-lock-only] again.npm will automatically resolve any conflicts for you and write amerged package lock that includes all the dependencies from bothbranches in a reasonable tree. If --package-lock-only is provided,it will do this without also modifying your local node_modules/.

To make this process seamless on git, consider installingnpm-merge-driver, which willteach git how to do this itself without any user interaction. Inshort: $ npx npm-merge-driver install -g will let you do this, andeven works with pre-npm@5.7.0 versions of npm 5, albeit a bit morenoisily. Note that if package.json itself conflicts, you will haveto resolve that by hand and run npm install manually, even with themerge driver.