mirror/pnpm
1
0
Fork 0
mirror of https://github.com/pnpm/pnpm.git synced 2026-06-27 01:15:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
main
pnpm/shell
History
Zoltan Kochan 58556049d1 chore: move PR conflict helper to root shell dir (#12656) 
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.
2026-06-25 15:24:21 +02:00
..
resolve-pr-conflicts.sh
chore: move PR conflict helper to root shell dir (#12656)
2026-06-25 15:24:21 +02:00