Menu
[UDS] 指導 Git 分支策略、分支命名與合併操作
The review-first prompt is selected by default. You can switch to a direct command or download a local copy.
Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
A direct command skips the review prompt. Inspect the source before running it.
npx skills add https://github.com/AsiaOstrich/universal-dev-standards --skill git-flowThe command stays on one line. Scroll horizontally to inspect it before copying.
Prefer a local copy? Download the files currently available to SkillsMP.
[UDS] 以 Claude 原生 Agent tool 编排多任务执行计划（DAG-based，无外部引擎）。 Use when: executing a plan.json file with parallel/sequential task dependencies. Keywords: orchestrate, plan, execute, DAG, task plan, 编排, 执行计划, 并行.
[UDS] 从 Spec 文档、OpenSpec 变更或自由文本需求生成 plan.json。 Use when: converting specifications into executable task plans for /orchestrate. Keywords: plan, spec, task plan, 计划, 规格, 任务, plan.json, DAG.
[UDS] AI 辅助 git push 安全层：质量门禁 + 协作护栏。 Use when: pushing commits, force pushing, pushing to protected branches, pushing feature branches. Keywords: git push, force push, protected branch, quality gate, push receipt, PR automation, 推送, 保护分支, 质量门禁.
Showing SKILL.md
| source | ../../../../skills/git-workflow-guide/SKILL.md |
| source_version | 1.0.0 |
| translation_version | 1.0.0 |
| last_synced | "2025-12-25T00:00:00.000Z" |
| status | current |
| name | git-flow |
| description | [UDS] 指導 Git 分支策略、分支命名與合併操作 |
語言: English | 繁體中文
版本: 1.0.0 最後更新: 2025-12-24 適用範圍: Claude Code Skills
本技能提供 Git 分支策略、分支命名慣例與合併操作的指導。
| 部署頻率 |
|---|
| 建議策略 |
|---|
| 每日多次 | Trunk-Based Development |
| 每週至雙週 | GitHub Flow |
| 每月或更長 | GitFlow |
<type>/<short-description>
| 類型 | 用途 | 範例 |
|---|---|---|
feature/ | 新功能 | feature/oauth-login |
fix/ 或 bugfix/ | 錯誤修復 | fix/memory-leak |
hotfix/ | 緊急生產環境修復 | hotfix/security-patch |
refactor/ | 程式碼重構 | refactor/extract-service |
docs/ | 僅文件變更 | docs/api-reference |
test/ | 測試新增 | test/integration-tests |
chore/ | 維護任務 | chore/update-dependencies |
release/ | 發布準備 | release/v1.2.0 |
完整標準請參閱：
建立新分支前：
檢查未合併的分支
git branch --no-merged main
同步最新程式碼
git checkout main
git pull origin main
驗證測試通過
npm test # 或您專案的測試指令
使用正確命名建立分支
git checkout -b feature/description
| 策略 | 使用時機 |
|---|---|
Merge Commit (--no-ff) | 長期功能、GitFlow 發布 |
| Squash Merge | 功能分支、乾淨歷史 |
| Rebase + FF | Trunk-Based、短期分支 |
# 良好範例
git checkout -b feature/user-authentication
git checkout -b fix/null-pointer-in-payment
git checkout -b hotfix/critical-data-loss
# 不良範例
git checkout -b 123 # 缺乏描述性
git checkout -b Fix-Bug # 非小寫
git checkout -b myFeature # 缺少類型前綴
# 1. 從 main 建立分支
git checkout main
git pull origin main
git checkout -b feature/user-profile
# 2. 進行變更並提交
git add .
git commit -m "feat(profile): add avatar upload"
git push -u origin feature/user-profile
# 3. 透過 GitHub/GitLab UI 建立 PR 並合併
# 4. 合併後刪除分支
git checkout main
git pull origin main
git branch -d feature/user-profile
# 1. 使用 main 更新您的分支
git checkout feature/my-feature
git fetch origin
git merge origin/main
# 2. 在檔案中解決衝突
# <<<<<<< HEAD
# 您的變更
# =======
# 傳入的變更
# >>>>>>> origin/main
# 3. 暫存已解決的檔案
git add resolved-file.js
# 4. 完成合併
git commit -m "chore: resolve merge conflicts with main"
# 5. 測試並推送
npm test
git push origin feature/my-feature
本技能支援專案特定的工作流程組態。
CONTRIBUTING.md 是否有「Git Workflow」或「Branching Strategy」章節若未找到組態：
CONTRIBUTING.md 中記錄：## Git 工作流程
### 分支策略
本專案使用 **[所選選項]**。
### 分支命名
格式：`<type>/<description>`
範例：`feature/oauth-login`、`fix/memory-leak`
### 合併策略
- 功能分支：**[Squash / Merge commit / Rebase]**
| 版本 | 日期 | 變更 |
|---|---|---|
| 1.0.0 | 2025-12-24 | 新增：標準章節（目的、相關標準、版本歷史、授權） |
本技能採用 CC BY 4.0 授權發布。
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
Based on SOC occupation classification
