mirror of
https://github.com/pnpm/pnpm.git
synced 2026-06-27 09:25:24 -04:00
Move the PR conflict resolution helper out of pnpm11/shell and into root shell/. The helper is invoked by the git-wt PR hook and applies to whole-repo PR conflict resolution, including non-TypeScript changes, so it should not live under the TypeScript workspace.