fvadicamo/github-pr-merge

GitHub PR merge

Merges Pull Requests after validating pre-merge checklist and handling post-merge cleanup.

Current PR

!gh pr view --json number,title,state -q '"PR #\(.number): \(.title) (\(.state))"' 2>/dev/null

Core workflow

1. Check comments status

Verify all review comments have at least one reply:

REPO=$(gh repo view --json nameWithOwner -q '.nameWithOwner')
PR=$(gh pr view --json number -q '.number')

# Find unreplied comment IDs
gh api repos/$REPO/pulls/$PR/comments --jq '
  [.[] | select(.in_reply_to_id) | .in_reply_to_id] as $replied |
  [.[] | select(.in_reply_to_id == null) | select(.id | IN($replied[]) | not) | .id]
'

If unreplied comments exist:

• STOP the merge process
• Inform user: "Found unreplied comments: [IDs]. Run github-pr-review first."
• NEVER reply to comments from this skill

2. Check milestone

gh pr view $PR --json milestone -q '.milestone.title // "none"'

• If milestone is assigned: include it in the checklist summary (step 3)
• If no milestone: check for open milestones and warn the user

gh api repos/$REPO/milestones --jq '[.[] | select(.state=="open")] | length'

If open milestones exist but the PR has none, surface a warning in the checklist: - Milestone: ⚠ not assigned (open milestones exist)

Do NOT block the merge for a missing milestone. It is a warning only.

3. Run validation

Run tests, linting, and verify CI checks. All MUST pass before proceeding.

gh pr checks $PR

4. Confirm with user

ALWAYS show checklist summary and ask before merging:

Pre-merge checklist:
- Comments: all replied
- Tests: passing
- Lint: passing
- CI: green
- Milestone: v0.1.0 (or ⚠ not assigned)

Ready to merge PR #X. Proceed?

5. Execute merge

gh pr merge $PR --merge --delete-branch --body "$(cat <<'EOF'
- Key change 1
- Key change 2
- Key change 3

Reviews: N/N addressed
Tests: X passed (Y% cov)
Refs: Task N, Req M
EOF
)"

Merge strategy: always --merge (merge commit), never squash or rebase.

--delete-branch automatically deletes the remote branch after merge.

6. Post-merge cleanup

git checkout develop && git pull origin develop

7. Check milestone completion

If the PR had a milestone, check whether all items are now closed:

MILESTONE=$(gh pr view $PR --json milestone -q '.milestone.number // empty')
if [ -n "$MILESTONE" ]; then
  gh api repos/$REPO/milestones/$MILESTONE \
    --jq '"Open: \(.open_issues) | Closed: \(.closed_issues) | \(.title)"'
fi

• If open_issues == 0: inform the user and ask whether to close the milestone

gh api repos/$REPO/milestones/$MILESTONE --method PATCH --field state="closed"

• If open_issues > 0: report remaining open items count. No action needed.
• NEVER close a milestone automatically without explicit user confirmation.

Merge message format

Concise format for a clean git log:

- Key change 1 (what was added/fixed)
- Key change 2
- Key change 3

Reviews: 7/7 addressed (Gemini 5, Codex 2)
Tests: 628 passed (88% cov)
Refs: Task 8, Req 14-15

• 3-5 bullet points max for changes
• One line each for reviews summary, test results, and task references
• No headers (##), no verbose sections
• Total: ~10 lines max

Important rules

• ALWAYS run tests, lint, and CI checks before merging
• ALWAYS verify all review comments have replies
• ALWAYS check milestone assignment before merging (warn if missing, do not block)
• ALWAYS confirm with user before executing merge
• ALWAYS use merge commit (--merge), never squash/rebase
• ALWAYS delete feature branch after successful merge
• ALWAYS check milestone completion after merge and report open items count
• NEVER merge with failing tests, lint, or CI checks
• NEVER skip user confirmation
• NEVER close a milestone without explicit user confirmation
• NEVER reply to PR comments from this skill - use github-pr-review instead
• STOP merge if unreplied comments exist and direct user to review skill