A merge driver for pnpm-lock.yaml
Globally ( recommended )
pnpm add -g @pnpm/merge-driverLocally in a repository ( this will not help you if you need to do a rebase/merge right now ! )
pnpm add -D @pnpm/merge-driverTo configure it on a repo, run:
pnpm add -g @pnpm/merge-driver
pnpm dlx npm-merge-driver install --driver-name pnpm-merge-driver --driver "pnpm-merge-driver %A %O %B %P" --files pnpm-lock.yaml