一键导入
finishing-a-development-branch
Use after verification-before-completion passes and code review is clean, to close out the development branch
用 Codex 或 Claude 帮你安装 复制这段 Prompt,粘贴到 Codex、Claude 或其他助手里,让它检查 Skill 页面并帮你完成安装。
菜单
Use after verification-before-completion passes and code review is clean, to close out the development branch
用 Codex 或 Claude 帮你安装 复制这段 Prompt,粘贴到 Codex、Claude 或其他助手里,让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Use when receiving an ambiguous feature request, when scope is unclear, or before writing any plan
Use after writing a plan document in docs/plans/, before requesting user confirmation
Use when receiving feedback from code-reviewer subagent or human reviewer
Use when a feature, bugfix, or refactoring step is completed and needs review, or before merging to main, or when user says "review", "审查", "帮我看看代码"
Use when executing an implementation plan with 3+ independent tasks in the current session
Use when facing Xcode build errors, linker failures, XCTest failures, event pipeline bugs, network issues, SDK crashes, or any technical problem where a first attempt didn't work or the cause is unclear
| name | finishing-a-development-branch |
| description | Use after verification-before-completion passes and code review is clean, to close out the development branch |
Type: Technique | Discipline: Rigid
功能做完、验证通过、审查通过后,进入"收尾阶段"。防止一类遗漏:
核心原则: 验证通过 ≠ 任务结束。必须走完收尾四步。
git status
git log --oneline $(git merge-base HEAD master)..HEAD
git diff --stat master..HEAD
回答:工作区有未 commit 的改动吗?本分支比 master 多了几个有意义的 commit?
<type>(<scope>): <subject>)禁止: git add -A 或 git add .,可能把 .env / Pods 等文件一起提交。
向用户呈现 4 个选项,不要擅自决定:
当前分支 <branch-name> 已准备好收尾,请选择:
A. 合并到 master(直接 merge,无 PR 审查)
B. 创建 PR(走 GitHub 审查流程)
C. 暂时保留分支(继续迭代或等待依赖)
D. 废弃分支(改动不再需要)
路径 A(合并到 master):
git checkout master
git pull
git merge --no-ff <branch-name>
git push
# 清理
git branch -d <branch-name>
git push origin --delete <branch-name>
路径 B(创建 PR):
gh pr create路径 C/D: 保留或删除分支
| 行为 | 原因 |
|---|---|
| 不问用户直接合并到 master | 合并是不可逆操作 |
git add -A | 容易提交敏感文件 |
| Excuse | Reality |
|---|---|
| "验证通过就算完成了" | 没合并/没 PR = 交付还没落地 |
| "直接 push 到 master 快一点" | master 合并必须用户确认 |
git add . 快一点" → 可能把 Pods / .env 推上去verification-before-completion 通过且 sdk-code-review 通过