Help us improve
Share bugs, ideas, or general feedback.
Guides Git branching strategies, branch naming conventions, and merge operations. Useful when creating branches, merging, or handling PRs.
npx claudepluginhub asiaostrich/universal-dev-standards --plugin universal-dev-standardsHow this skill is triggered — by the user, by Claude, or both
Slash command
/universal-dev-standards:git-workflow-guideThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
> **Language**: English | [繁體中文](../../locales/zh-TW/skills/git-workflow-guide/SKILL.md)
Guides Git workflows with branching strategies (GitHub Flow, Git Flow), conventional commit messages, branch naming, PR templates, and operations like rebase. Use for Git ops, commits, branches, team workflows.
Guides Git branching strategies (GitHub Flow, trunk-based, GitFlow), commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices.
Provides Git workflow patterns including branching strategies, commit conventions, merge vs rebase, and conflict resolution for teams of all sizes.
Share bugs, ideas, or general feedback.
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