Stats
Actions
Tags
How this skill is triggered — by the user, by Claude, or both
Slash command
/git-tools:branchThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
智能分支管理技能 - 策略、操作自动化和冲突解决。
智能分支管理技能 - 策略、操作自动化和冲突解决。
# 创建功能分支
/branch create feature PROJ-123 "添加用户认证"
# 合并分支
/branch merge feature/auth into develop
# 检查冲突
/branch check-conflicts feature/auth develop
# 清理分支
/branch cleanup
main (生产)
└── develop (开发)
├── feature/* (功能)
├── release/* (发布)
└── hotfix/* (热修)
适用场景：
main (始终可部署)
└── feature/* (功能分支，合并后删除)
适用场景：
main (主干)
└── short-lived-feature/* (短期分支，<1天)
适用场景：
| 类型 | 格式 | 示例 |
|---|---|---|
| 功能 | feature/<ticket>-<desc> | feature/PROJ-123-user-auth |
| 修复 | fix/<ticket>-<desc> | fix/PROJ-456-login-error |
| 热修 | hotfix/<version>-<desc> | hotfix/v1.2.1-security-patch |
| 发布 | release/<version> | release/v2.0.0 |
| 实验 | experiment/<desc> | experiment/new-algorithm |
git merge --no-commit --no-ff 预检git checkout --ours <file>git checkout --theirs <file>git mergetool# 清理已合并的本地分支
git branch --merged main | grep -v "^\*\|main\|develop" | xargs git branch -d
# 清理远程已删除的追踪分支
git fetch --prune
# 批量清理
/branch cleanup --merged --stale=30
{
"branch": {
"strategy": "gitflow",
"autoNaming": true,
"protection": true,
"autoCleanup": true,
"mainBranches": ["main", "develop"],
"staleDays": 30
}
}
npx claudepluginhub protagonistss/ithinku-plugins --plugin git-toolsGuides Git branching strategies, branch naming conventions, and merge operations. Useful when creating branches, merging, or handling PRs.
Implements git branching strategies like Git Flow with naming conventions, prefixes, and best practices for clear development narratives and parallel workflows.
Design branching strategies (git flow, trunk-based development, etc.) that support parallel work while maintaining stability. Use when establishing version control discipline or managing deployment complexity.