메뉴
Guide Git branching strategies, branch naming, and merge operations. Use when: creating branches, merging, pull requests, Git workflow questions. Keywords: branch, merge, PR, pull request, GitFlow, GitHub Flow, 分支, 合併, 工作流程.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
| name | git-workflow-guide |
| scope | universal |
| description | Guide Git branching strategies, branch naming, and merge operations. Use when: creating branches, merging, pull requests, Git workflow questions. Keywords: branch, merge, PR, pull request, GitFlow, GitHub Flow, 分支, 合併, 工作流程. |
Language: English | 繁體中文
Version: 1.0.0 Last Updated: 2025-12-24 Applicability: Claude Code Skills
Core Standard: This skill implements Git Workflow. For comprehensive methodology documentation, refer to the core standard.
This skill provides guidance on Git branching strategies, branch naming conventions, and merge operations.
| Deployment Frequency | Recommended Strategy |
|---|---|
| Multiple times/day | Trunk-Based Development |
| Weekly to bi-weekly | GitHub Flow |
| Monthly or longer | GitFlow |
<type>/<short-description>
| Type | Usage | Example |
|---|---|---|
feature/ | New functionality | feature/oauth-login |
fix/ or bugfix/ | Bug fixes | fix/memory-leak |
hotfix/ | Urgent production fixes | hotfix/security-patch |
refactor/ | Code refactoring | refactor/extract-service |
docs/ | Documentation only | docs/api-reference |
test/ | Test additions | test/integration-tests |
chore/ | Maintenance tasks | chore/update-dependencies |
release/ | Release preparation | release/v1.2.0 |
For complete standards, see:
For AI assistants, use the YAML format files for reduced token usage:
ai/standards/git-workflow.ai.yamlai/options/git-workflow/github-flow.ai.yamlai/options/git-workflow/gitflow.ai.yamlai/options/git-workflow/trunk-based.ai.yamlai/options/git-workflow/squash-merge.ai.yamlai/options/git-workflow/merge-commit.ai.yamlai/options/git-workflow/rebase-ff.ai.yamlBefore creating a new branch:
Check for unmerged branches
git branch --no-merged main
Sync latest code
git checkout main
git pull origin main
Verify tests pass
npm test # or your project's test command
Create branch with proper naming
git checkout -b feature/description
| Strategy | When to Use |
|---|---|
Merge Commit (--no-ff) | Long-lived features, GitFlow releases |
| Squash Merge | Feature branches, clean history |
| Rebase + FF | Trunk-Based, short-lived branches |
# Good
git checkout -b feature/user-authentication
git checkout -b fix/null-pointer-in-payment
git checkout -b hotfix/critical-data-loss
# Bad
git checkout -b 123 # Not descriptive
git checkout -b Fix-Bug # Not lowercase
git checkout -b myFeature # No type prefix
# 1. Create branch from main
git checkout main
git pull origin main
git checkout -b feature/user-profile
# 2. Make changes and commit
git add .
git commit -m "feat(profile): add avatar upload"
git push -u origin feature/user-profile
# 3. Create PR and merge via GitHub/GitLab UI
# 4. Delete branch after merge
git checkout main
git pull origin main
git branch -d feature/user-profile
# 1. Update your branch with main
git checkout feature/my-feature
git fetch origin
git merge origin/main
# 2. Resolve conflicts in files
# <<<<<<< HEAD
# Your changes
# =======
# Incoming changes
# >>>>>>> origin/main
# 3. Stage resolved files
git add resolved-file.js
# 4. Complete merge
git commit -m "chore: resolve merge conflicts with main"
# 5. Test and push
npm test
git push origin feature/my-feature
This skill supports project-specific workflow configuration.
CONTRIBUTING.md for "Git Workflow" or "Branching Strategy" sectionIf no configuration found:
CONTRIBUTING.md:## Git Workflow
### Branching Strategy
This project uses **[chosen option]**.
### Branch Naming
Format: `<type>/<description>`
Example: `feature/oauth-login`, `fix/memory-leak`
### Merge Strategy
- Feature branches: **[Squash / Merge commit / Rebase]**
After /git-flow completes, the AI assistant should suggest:
Git 工作流程已設定。建議下一步 / Git workflow configured. Suggested next steps:
- 執行
git checkout -b feature/<描述>建立功能分支開始開發 ⭐ Recommended / 推薦 — 立即套用所選的分支策略 / Apply the chosen branching strategy immediately- 執行
/commit學習提交訊息規範 — 確保提交訊息格式一致 / Ensure consistent commit message format- 執行
/checkin了解簽入品質門檻 — 在提交前確保程式碼品質 / Ensure code quality before commits
| Version | Date | Changes |
|---|---|---|
| 1.0.0 | 2025-12-24 | Added: Standard sections (Purpose, Related Standards, Version History, License) |
This skill is released under CC BY 4.0.
Source: universal-dev-standards
Propose a new change with all artifacts generated in one step. Use when the user wants to quickly describe what they want to build and get a complete proposal with design, specs, and tasks ready for implementation.
審視 ECC（everything-claude-code）分發名單，包含兩個模式： (A) 既有清單瘦身：分析 distribution.yaml.enabled 與本地 skills/ 的重疊性與品質，輸出 enabled_remove 建議； (B) 新項目導入評估：根據 ecc-catalog.yaml 與上次更新範圍，介紹 ECC 上游新增 skill、分析適用情境、建議是否加入 enabled。 Use when: (1) 評估 ECC 分發名單是否該瘦身、(2) ECC 上游新增 skill 後決定要不要導入、 (3) 想為終端使用者產 ecc-profile.yaml starter、(4) 季度 / 半年一次定期審視。 Triggers: "分析 ECC skill", "ECC 重疊", "ECC 清單瘦身", "ECC 新項目", "ECC 上游新增", "要不要導入", "ecc analyze", "ecc new items review", "ecc profile starter", "ECC 品質審視".
用追問把模糊需求壓成專案語言，並在必要時更新 CONTEXT.md 或 ADR。 Use when: 需求還不清楚、術語不一致、要進 OpenSpec 前需要需求對齊、 或使用者想先 stress-test plan 而不是直接實作。
找出架構摩擦與 deep module 候選，但不直接修改實作程式碼。 Use when: 使用者要架構回看、找重構候選、改善可測性、 或把實作中暴露的架構摩擦整理成 OpenSpec 候選。
建立 MP 工作入口層的專案規則。Use when: 首次導入 mattpocock/skills 改寫版、 需要設定 docs/agents/、需要讓 Claude Code 與 Codex 共同讀取 issue tracker、 triage states、domain docs 規則，或 mp-* 技能缺少專案入口脈絡。
將 plan、PRD、OpenSpec change 或對話摘要切成可驗證的垂直切片。 Use when: 需要把大型需求拆成 OpenSpec tasks、GitHub issue draft、 或本地 Markdown 工作項目；不適用於直接 TDD 實作。