Agent skill
pr-merge
Merge a pull request with configured strategy and branch cleanup
Install this agent skill to your Project
npx add-skill https://github.com/majiayu000/claude-skill-registry/tree/main/skills/other/other/pr-merge-daemn256-workspace-repo-templ
SKILL.md
PR Merge
Uses Orchestrator. Merge an approved pull request using the configured merge strategy, clean up the branch, and update board status.
Prerequisites: PR is approved, CI passes (if required by profile), merge conflicts resolved
Process
- Identify the PR to merge (by number or current branch)
- Verify merge readiness:
- PR is approved (per profile requirements)
- CI checks pass (if required)
- No merge conflicts
- Determine merge strategy (read
project.merge-methodfromworkspace.config.yaml) - Present merge plan for approval
Review Requirements by Profile
| Profile | Reviewers | CI Required | Self-Merge | Approval Expires |
|---|---|---|---|---|
lightweight |
0 | No | Yes | Never |
standard |
1 | Yes | No | On new commits |
regulated |
2 | Yes | No | On new commits |
Check process.profile in workspace.config.yaml to determine which rules apply.
Merge Strategy
| Strategy | When to Use |
|---|---|
| Merge commit | Default. Preserves full branch history on main |
| Squash | Explicit override — single-logical-change PRs only |
| Rebase | Explicit override — linear history, clean single-topic branch |
Output
## Context Anchors
- **PR:** #<pr-number> - <title>
- **Issue:** #<issue-number>
- **Strategy:** <merge method>
## Merge Plan
- PR: #<number> (<status>)
- Strategy: <merge commit | squash | rebase>
- Branch cleanup: delete remote branch after merge
- Board update: set issue to Done
## Next Step
Awaiting approval to merge.
**Approval Required:** Yes
⛔ CHECKPOINT
STOP. Do not merge until human explicitly approves.
- Execute merge via forge operations
- Delete remote branch (if not auto-deleted)
- Pull main locally:
git checkout main && git pull - Update board status to Done for the linked issue
Board Integration
Read workspace.config.yaml for board field IDs.
Set issue status to Done (board.status_options.done.option_id).
Error Handling
| Error | Recovery |
|---|---|
| Merge conflicts | Resolve conflicts before merging |
| CI failing | Fix failing checks first |
| Approval missing | Request review from required reviewers |
| Branch out of date | Rebase or merge base branch into feature |
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
Didn't find tool you were looking for?