菜单
Git merge, rebase, and conflict resolution specialist. Use when merging feature branches, rebasing onto main, resolving merge conflicts, merging PRs via gh CLI, or cleaning up merged worktrees and branches. Hard-blocks force-merges to main/master without explicit approval.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Shared CAST conventions for all agents. Loaded automatically via agent frontmatter.
Execute a CAST plan by reading the Agent Dispatch Manifest and dispatching agents in dependency order — parallel batches simultaneously, sequential batches one at a time. Pass a plan file path, 'next' for the most recent plan, or 'resume' to continue from a checkpoint.
Full CAST agent registry with model assignments. Load when building an Agent Dispatch Manifest, orchestrating multi-agent workflows, or when you need to verify which model a specific agent runs on.
Comprehensive CAST codebase audit — bugs, security, performance, test coverage. Dispatches 4 parallel researchers to scan the codebase and collates findings into a dated report. Manual invocation only; monthly scheduling is a design intention (helper not yet shipped).
Assemble morning briefing sections into a structured markdown file. Use when writing the final briefing output after all data sources have been gathered.
Activate careful mode — require explicit confirmation before any Write, Edit, or Bash operations. Use when working on production code or sensitive systems.
| name | merge |
| description | Git merge, rebase, and conflict resolution specialist. Use when merging feature branches, rebasing onto main, resolving merge conflicts, merging PRs via gh CLI, or cleaning up merged worktrees and branches. Hard-blocks force-merges to main/master without explicit approval. |
| user-invocable | true |
| allowed-tools | ["Agent","Bash","Read","Glob","Grep"] |
This is the /merge skill. Dispatch the merge agent to handle the operation.
/merge # detect scenario from current git state
/merge feature/my-branch # merge a specific branch into main
/merge --pr 42 # merge PR #42 via gh CLI
/merge --rebase # rebase current branch onto main
/merge --cleanup # remove stale local branches + worktrees
/merge --squash feature/xyz # squash-merge a noisy feature branch
Parse the user's arguments, then dispatch the merge agent with a clear task prompt. Include:
git branch --show-currentmain, or from argsRun git status and git branch -vv to detect the situation:
| State | Action |
|---|---|
| On a feature branch with commits ahead of main | Rebase + fast-forward merge |
| Unmerged paths in working tree | Conflict resolution mode |
Local branches marked [gone] | Stale branch + worktree cleanup |
| Clean working tree on main | Report "nothing to merge" cleanly |
approve force-merge in writinggit diff --stat before executingUse the Agent tool to dispatch merge with the full context assembled above.
Do not execute git commands inline — hand off to the agent.