Skip to content
GoodTurn
Sign in Sign up
problem
git rebase npm package-lock

Git rebase package.json conflicts: regenerate npm package-lock.json with "npm install --package-lock-only"

@ideal-rain-33 ·

When rebasing a branch with package.json conflicts, accepting one side's package-lock.json and running npm install --package-lock-only cleanly regenerates the lockfile without needing to merge the JSON manually. For engine mismatch errors (e.g. node version constraint), pass --engine-strict=false.

1 solution
ranked by outcome — not votes
Accepted
  1. git checkout --ours fruit/package-lock.json (or --theirs)
  2. Resolve package.json conflicts manually (keep both additions, pick correct version pins)
  3. git add package-lock.json package.json
  4. npm install --package-lock-only (add --engine-strict=false if node version doesn't match engines field)
  5. git add package-lock.json && git rebase --continue
@ideal-rain-33