AgentSkillsCN

merge-pull-request

在 CI 测试通过后，使用 GitHub CLI 合并 Pull Request。支持 Squash 合并、远程分支清理，以及本地同步操作。本地分支始终得以保留（绝不会自动删除）。当用户希望合并 PR，或请求完成某项功能时，此方案可有效协助用户达成目标。

SKILL.md
--- frontmatter
name: merge-pull-request
description: Merges a Pull Request using GitHub CLI after verifying CI passes. Handles squash merge, remote branch cleanup, and local sync. Local branch is ALWAYS preserved (never auto-deleted). Use when user wants to merge a PR or asks to complete/finish a feature.

Merge Pull Request Skill

Purpose

Merges an approved Pull Request using gh pr merge, cleans up the remote feature branch only, and syncs the local repository. Local branch is NEVER deleted.

Prerequisites

  • •GitHub CLI (gh) installed and authenticated
  • •PR must exist and be approved (at least one approval required)
  • •CI checks must pass
  • •All discussions must be resolved (no unresolved discussions)

Workflow

Step 1: Verify PR Status

bash
# Check PR status, reviews, and discussions
gh pr view <PR_NUMBER> --json state,reviewDecision,statusCheckRollup,reviewThreads

# Or check current PR
gh pr status

Verify:

  • •state: OPEN
  • •reviewDecision: APPROVED (required — do not merge without approval)
  • •All status checks passing
  • •No unresolved discussions — check reviewThreads for any with isResolved: false

If not approved: Stop and inform the user that the PR needs approval before merging.

If unresolved discussions exist: Stop and inform the user that all discussions must be resolved before merging.

Step 2: Merge the PR

Use squash merge (default for this project):

bash
# Squash merge — remote branch deleted, local branch PRESERVED
gh pr merge <PR_NUMBER> --squash

# Then delete ONLY the remote branch manually
git push origin --delete <feature-branch>

IMPORTANT: Do NOT use --delete-branch flag — it deletes both remote AND local branches.

Merge options:

  • •--squash — Combines all commits into one (preferred)
  • •--rebase — Rebases commits onto base branch
  • •--merge — Creates merge commit

Step 3: Sync Local Repository

bash
# Switch to main and pull
git checkout main
git pull origin main

Note: Local feature branch is kept for reference. Delete manually with git branch -d <branch> when no longer needed.

Step 4: Confirm Success

bash
# Verify merge
gh pr view <PR_NUMBER> --json state,mergedAt

# Check main branch has the changes
git log --oneline -5

Error Handling

ErrorSolution
CI checks failingWait for CI or investigate failures
Not approvedDo not merge. Inform user PR requires approval first
Unresolved discussionsDo not merge. Inform user all discussions must be resolved first
Merge conflictsResolve conflicts locally, push, then merge
Branch protectionEnsure all requirements met

Example

User says: "Merge the PR"

Agent workflow:

  1. •Run gh pr status to identify current PR
  2. •Check approval: gh pr view --json reviewDecision — must be APPROVED
  3. •Check discussions: gh pr view --json reviewThreads — ensure none have isResolved: false
  4. •Verify CI passes with gh pr checks
  5. •Run gh pr merge <PR_NUMBER> --squash
  6. •Delete remote branch: git push origin --delete <feature-branch>
  7. •Switch to main: git checkout main && git pull
  8. •Prune remotes: git fetch --prune
  9. •Confirm: "✅ PR #123 merged. Remote branch deleted. Local branch preserved."

Notes

  • •Always use --squash for cleaner history
  • •NEVER use --delete-branch — it deletes both remote AND local branches
  • •Delete remote branch manually with git push origin --delete <branch>
  • •Check for unresolved discussions — GitHub CLI can query reviewThreads to find any with isResolved: false
  • •Sync local repo immediately after merge
  • •Local feature branch is always preserved for reference; user can delete manually with git branch -d <branch> when no longer needed
  • •If PR was created from a fork, remote branch deletion only affects the fork