菜单
Merge dev branch into master/main and push. Use when dev changes are ready for production branch. Invoked by saying "merge to master" or "merge to main".
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
基于 SOC 职业分类
Batch-commit all uncommitted changes grouped by relevance. Use when multiple accumulated changes need committing. Invoked by saying "commit all" or "commit everything".
Stage, commit, and push code changes with branch safety and explicit staging. Use when ready to commit work. Invoked by saying "commit", "push", or "commit and push".
Document completed work — update task log, sync documentation, log observations. Use after finishing a task or batch of changes.
Execute a previously created implementation plan — implement, test, document, and close out. Use when a plan file exists and is ready for implementation.
Create a detailed implementation plan before coding. Use when starting a new feature, multi-step refactor, or complex task. Invoked by saying "plan", "create a plan", or "plan this task".
Generate a structured report on completed work, a feature area, or a topic. Saved to the reports directory. Invoked by saying "report", "generate report", or "summarize work".
| name | merge-master |
| description | Merge dev branch into master/main and push. Use when dev changes are ready for production branch. Invoked by saying "merge to master" or "merge to main". |
Merge the dev branch into master (or main) and push. Includes safety checks.
Ensure all dev changes are pushed — run git status and git log origin/dev..dev. If there are unpushed commits, push them first (with user approval).
Switch to master/main:
git checkout master # or main
git pull origin master
Merge dev:
git merge dev --no-ff -m "merge(dev→master): <summary>"
If there are conflicts, report them and wait for user instructions.
Push master:
git push origin master
Switch back to dev:
git checkout dev