Zoltan Kochan f7bb668100 docs: add PR conflict resolution guide and helper script (#11060) ...

Add a "Resolving Conflicts in GitHub PRs" section to AGENTS.md with
step-by-step instructions for force-fetching refs, rebasing, resolving
lockfile conflicts, and verifying mergeability.

Add shell/resolve-pr-conflicts.sh that automates the workflow: fetches
metadata, force-updates the base ref, rebases, auto-resolves lockfile
conflicts via pnpm install, force-pushes, and verifies the result.

2026-03-22 13:22:11 +01:00

..

path

refactor: prefix internal scripts with . to hide them (#11051)

2026-03-21 14:30:56 +01:00

cleanup-worktrees.sh

chore: add script to clean up worktrees with merged PRs (#10953)

2026-03-13 13:48:35 +01:00

resolve-pr-conflicts.sh

docs: add PR conflict resolution guide and helper script (#11060)

2026-03-22 13:22:11 +01:00

wt.fish

docs: add PR conflict resolution guide and helper script (#11060)

2026-03-22 13:22:11 +01:00

wt.sh

chore: add worktree helper script and shell functions (#10938)

2026-03-11 22:59:42 +01:00