菜单
Merge git branches with auto-generated Conventional Commits messages. Use when merging branches, finishing feature work, or creating merge commits.
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
| name | git-workflow:merge |
| description | Merge git branches with auto-generated Conventional Commits messages. Use when merging branches, finishing feature work, or creating merge commits. |
Merge branches with auto-generated Conventional Commits messages.
$merge # Merge current branch into develop/main
$merge feature/auth # Merge specific source branch
$merge develop main # Merge develop into main
$merge -i "#123" -s auth-flow # With issue and spec references
$merge --yes # Skip confirmation
$merge --all # Merge across all sub-repos
| Flag | Description |
|---|---|
-i, --issue <id> | Issue ID for commit message |
-s, --spec <name> | Spec name for commit message |
--all | Merge across all git repos in subdirectories |
-y, --yes | Skip confirmation prompt |
merge.md (in this skill directory)Use the companion merge.md in this directory as the agent prompt. Provide it with:
Inject reviewer-aligned rules into openspec/config.yaml so generated specs pass review on first attempt. Use to reduce review round-trips after /opsx:ff or spectra-propose.
Review implementation against a spec using git diffs to catch mismatches, missing work, and bugs. Supports iterative review+fix with --fix flag and parallel multi-angle review. Use after implementing a feature to verify spec coverage.
Dual-engine spec review — Claude and Codex review the same change in parallel, then a Workflow loops fixes until BOTH engines are MEDIUM-clean. Use when a spec is high-stakes and you want two different models to cross-check for blind spots before implementation. Requires the openai-codex plugin for the Codex engine.
Review a spec, proposal, or design before implementation to catch gaps, risks, and ambiguities. Runs multi-angle parallel review by default; scans codebase for context first. Use --fix for iterative review+fix loop (agent escalates design-judgment issues to you), --angles to narrow the angle set.
Frame a feature, bug, or design question before building: scout the codebase, surface assumptions or interview, compare options, and converge on an explicit decision. Use when an idea needs sharpening before a spec or plan exists. Read-only — never implements.
Synthesize git activity across multiple projects over a time window into themed recall notes. Clusters commits into themes (features, fixes, refactors, infra, learning surface, tickets, side quests), auto-hides empty sections, and surfaces work that PM tools don't track. Use when the user asks 'what did I do last week', wants a multi-project activity summary, or needs to recall their development history.