squash-merge-pr

Squash Merge PR

Validates PR readiness and executes squash merge. If the PR is not ready, errors immediately and suggests /finalize-pr to fix issues. Never fixes issues — only merges.

Critical Rules

• Never fix issues — only merge. If PR isn't ready, error and suggest /finalize-pr
• Never update PR metadata — that's /finalize-pr's job
• Never skip validation — always run the GraphQL check before merging

Step 1: Validate PR Ready

Read @git-workflows/skills/rebase-pr/SKILL.md Step 1 — use its GraphQL query, fields, and abort conditions as the single source of truth.

If any check fails, abort immediately with the field's failure message and append: — run /finalize-pr to fix.

Step 2: Generate Squash Commit Message

Analyze the full changeset to generate a release-note-friendly commit message:

git fetch origin main
git diff origin/main...HEAD
git log --oneline origin/main..HEAD

Generate:

• Title: Conventional commit format (<type>: <description>, under 70 chars)
• Body: 2-3 line explanation of what changed and why

Types: feat, fix, refactor, docs, test, chore

Store the title in a shell variable and write the body to a temp file using the Write tool (avoids shell quoting issues with multi-line text):

SQUASH_TITLE="<generated title>"
SQUASH_BODY_FILE=$(mktemp)

Use the Write tool to write the generated body text to the path stored in $SQUASH_BODY_FILE.

Step 3: Execute Squash Merge

Capture the branch name before merging (needed for cleanup):

BRANCH=$(gh pr view {pr} --json headRefName --jq '.headRefName')

Merge without --delete-branch (avoids git switch failure in bare+worktree repos):

gh pr merge {pr} --squash --subject "$SQUASH_TITLE" --body-file "$SQUASH_BODY_FILE"
rm -f "$SQUASH_BODY_FILE"

Delete the remote branch (GitHub may have auto-deleted it on merge — || true handles that):

git push origin --delete "$BRANCH" || true

Find and remove the local worktree by branch name (works in any repo layout):

WORKTREE_PATH=$(git worktree list --porcelain | awk -v b="refs/heads/$BRANCH" '/^worktree/{p=$2} $0=="branch "b{print p}')
[ -n "$WORKTREE_PATH" ] && git worktree remove "$WORKTREE_PATH" || true

Delete the local branch ref (safe no-op if absent):

git branch -d "$BRANCH" || true

Step 4: Sync Main

git switch main
git pull origin main
git worktree prune

Integration

Invoke after /finalize-pr reports ready:

/squash-merge-pr          # Current branch PR
/squash-merge-pr 42       # Specific PR number

Related Skills

• finalize-pr (github-workflows) — drives PR to mergeable state before squash-merge-pr is invoked
• rebase-pr (git-workflows) — alternative merge strategy that preserves commit history
• pr-standards (git-standards) — PR authoring and review standards