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 produce. "Accept Both Changes" leaves duplicate JSON keys or invalid TOML/YAML. Accepting one side looks fine, but the other branch's new... Weiterlesen: How to fix package-lock.json merge conflicts (and yarn.lock, poetry.l…