Urgent.News

What's breaking now, across thousands of outlets.

More in Tech

How to fix package-lock.json merge conflicts (and yarn.lock, poetry.lock, go.sum) the right way

You rebase on main and git stops: CONFLICT (content): Merge conflict in package-lock.json The usual reflexes are all wrong: Hand-editing the markers away gives you a dependency tree no resolver would…

  • Merge conflicts in lockfiles like package-lock.json must be resolved manually, not hand-edited
  • Tools like npm, Yarn, pnpm can read conflicted lockfiles and merge both sides automatically
  • VS Code LockSettle extension automates resolution of conflicted lockfiles in VS Code

More from Thursday 1 October →