merge-pr

name	merge-pr
description	Merge a pull request safely with all required checks. Use when the user says "merge", "merge the PR", "let's merge", "ship it", or asks to complete/land a pull request. Enforces CI pass, comment resolution, and squash merge.

Merge Pull Request

Safely merge a PR with all mandatory checks. Never skip steps.

CRITICAL: Never merge automatically. After completing all checks (CI, comments), always stop and ask the user for explicit confirmation before merging. The user may have additional instructions, want to review something first, or need to coordinate timing.

Procedure

Step 0: Ask for confirmation

After creating a PR or when the user mentions merging, always ask the user first:

• Report: CI status, comment status, PR summary
• Then ask: "Ready to merge?" or "Shall I squash merge this?"
• Wait for explicit "yes" / confirmation before proceeding to the merge step.
• Do NOT merge just because all checks pass. The user decides when.

Step 1

If the current branch has an open PR, always reuse it. Push new commits to the same branch — do NOT create a new branch or a new PR. The existing PR will update automatically.

IMPORTANT: There should normally be only one open PR at a time. If multiple PRs are open, ask the user which one to merge first. Do NOT create new PRs until existing ones are merged.

Step 2: Check CI status

gh pr checks <PR_NUMBER>

• All checks must pass. If any check is pending, wait and re-check (sleep 15–30s between attempts, up to 5 minutes).
• If a check fails, stop. Report the failure to the user. Do NOT merge.

Step 3: Check PR comments

gh api repos/{owner}/{repo}/pulls/<PR_NUMBER>/comments

Also check review comments:

gh api repos/{owner}/{repo}/pulls/<PR_NUMBER>/reviews

• If there are unresolved comments or change requests, stop. Show the comments to the user and address them. After fixing, push changes and go back to Step 2.
• If there are no comments or all are resolved/approved, proceed.

Step 3.5: Resolve merge conflicts

Check if the PR has merge conflicts and resolve them

Step 4: Squash merge

ALWAYS use squash merge. Never regular merge or rebase.

gh pr merge <PR_NUMBER> --squash

Step 5: Update local main

git checkout main && git pull

Step 6: Confirm

Report to the user:

• PR number and title
• Merge status (success)
• Any post-merge actions (e.g., deploy triggered)