Skip to content

Conflicting package-lock.json in Git?

Include package-lock.json in your git repository, but try to commit it alone (to avoid noise in diffs).

When encountering conflicts during merge:

npm install --package-lock-only

As running that command then suggests, you might also want to consider automating the process by installing npm-merge-driver (npx npm-merge-driver install -g).