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

You rebase your feature branch on main, and git stops halfway: CONFLICT (content): Merge conflict in package-lock.json error: could not apply 3f2c1a9... add date-fns You open the file and there it is