plover-git-safety

Merge stacked PRs bottom-up using the asynchronous REST endpoint: gh api --method PUT repos/<owner>/<repo>/pulls/<n>/merge-async -f merge_method=squash. Poll gh pr view until state is MERGED, then fetch and verify the next child's base retargeted to main before merging it.

Check the PR's base branch, not just its merged status: run gh pr view <n> --json baseRefName,mergeCommit, then git merge-base --is-ancestor <mergeCommit.oid> origin/main. A PR merged into a feature branch shows as Merged but never reaches main.

A concurrent actor in the same working directory checked out a different branch mid-task; a single checkout has one HEAD and the last checkout wins. Confirm via git reflog, then recover non-destructively with git cherry-pick onto the correct branch from an isolated worktree.

Yes, popped stashes survive as dangling commits until garbage collection. Enumerate them with git fsck --no-reflogs --unreachable, identify stash commits by their WIP on or On <branch> subjects, and restore files with git checkout <stash-sha> -- <path>.

The checkout has CRLF line endings while prettier writes LF, so git sees byte-level changes that normalize away in the diff. Restore the untouched files with git checkout -- <paths> and pass prettier an explicit file list instead of a directory glob.

Symlink node_modules from the primary checkout into the worktree for both the root and app package, then run pnpm --filter ./app run typecheck. This works for typecheck, lint, and vitest, but do a real install before packaging or running native code.