| name | git-workflow-cn |
| version | 1.0.0 |
| description | Git 工作流助手 - 分支管理、冲突解决、提交规范。适合:开发者、团队协作。 |
| metadata | {"openclaw":{"emoji":"🌳","requires":{"bins":["git"]}}} |
Git 工作流助手 Skill
Git 分支管理、冲突解决、提交规范,提升团队协作效率。
核心功能
| 功能 | 描述 |
|---|
| 分支管理 | 创建、切换、合并分支 |
| 冲突解决 | 识别和解决冲突 |
| 提交规范 | Conventional Commits |
| 常见问题 | 撤销、回滚、恢复 |
使用方法
分支操作
创建并切换到新分支 feature/login
冲突解决
帮我解决 Git 合并冲突
提交建议
为这些改动生成符合规范的提交信息
常用命令速查
基础操作
git init
git clone URL
git config --global user.name "Your Name"
git config --global user.email "email@example.com"
git status
git log --oneline
git log --graph --oneline --all
git diff
git show COMMIT_ID
分支管理
git branch
git branch -a
git branch -r
git branch feature/login
git checkout -b feature/login
git switch -c feature/login
git checkout feature/login
git switch feature/login
git merge feature/login
git merge --no-ff feature/login
git branch -d feature/login
git branch -D feature/login
git push origin --delete feature/login
远程操作
git remote -v
git remote add origin URL
git remote set-url origin URL
git fetch origin
git pull origin main
git push origin main
git push -u origin feature/login
git remote prune origin
git fetch --all --prune
暂存操作
git stash
git stash save "message"
git stash list
git stash pop
git stash apply
git stash drop stash@{0}
git stash clear
提交规范
Conventional Commits
<type>(<scope>): <subject>
<body>
<footer>
Type 类型
| Type | 描述 | 示例 |
|---|
| feat | 新功能 | feat(auth): 添加登录功能 |
| fix | 修复 bug | fix(api): 修复接口超时 |
| docs | 文档更新 | docs(readme): 更新安装说明 |
| style | 代码格式 | style: 格式化代码 |
| refactor | 重构 | refactor(utils): 优化工具函数 |
| perf | 性能优化 | perf(list): 优化列表渲染 |
| test | 测试 | test(auth): 添加登录测试 |
| chore | 构建/工具 | chore: 更新依赖 |
| ci | CI 配置 | ci: 添加 GitHub Actions |
| revert | 回滚 | revert: 回滚登录功能 |
提交示例
git commit -m "feat(user): 添加用户注册功能"
git commit -m "fix(payment): 修复支付金额计算错误"
git commit -m "docs(api): 更新接口文档"
git commit -m "refactor(auth): 重构认证逻辑
- 提取公共方法
- 优化错误处理
- 添加单元测试"
git commit -m "feat(api)!: 修改 API 响应格式
BREAKING CHANGE: 响应格式从 {code, data} 改为 {status, result}"
工作流模式
Git Flow
git flow init
git flow feature start login
git flow feature finish login
git flow release start v1.0.0
git flow release finish v1.0.0
git flow hotfix start fix-login-bug
git flow hotfix finish fix-login-bug
GitHub Flow
git checkout -b feature/login main
git add .
git commit -m "feat: 添加登录功能"
git push origin feature/login
git checkout main
git pull origin main
git merge feature/login
git push origin main
GitLab Flow
git checkout -b feature/login main
git push origin feature/login
git checkout main
git merge feature/login
git checkout staging
git merge main
git push origin staging
git checkout production
git merge staging
git push origin production
冲突解决
识别冲突
git status
<<<<<<< HEAD
当前分支内容
=======
合并分支内容
>>>>>>> feature/login
解决冲突
git add .
git commit
冲突工具
git mergetool
git config --global merge.tool code
git config --global mergetool.code.cmd 'code --wait $MERGED'
git diff HEAD
git diff --ours
git diff --theirs
常见问题解决
撤销操作
git checkout -- file.txt
git restore file.txt
git reset HEAD file.txt
git restore --staged file.txt
git reset --soft HEAD~1
git reset --hard HEAD~1
git commit --amend -m "新信息"
回滚代码
git revert COMMIT_ID
git revert COMMIT_ID1..COMMIT_ID2
git revert --no-commit COMMIT_ID
恢复删除
git checkout COMMIT_ID -- file.txt
git reflog
git reset --hard COMMIT_ID
git reflog
git checkout -b branch_name COMMIT_ID
清理仓库
git clean -n
git clean -f
git clean -fd
git filter-branch --force --index-filter \
'git rm --cached --ignore-unmatch path/to/file' \
--prune-empty --tag-name-filter cat -- --all
bfg --delete-folders folder_name
git reflog expire --expire=now --all
git gc --prune=now --aggressive
别名配置
[alias]
co = checkout
br = branch
ci = commit
st = status
unstage = reset HEAD --
last = log -1 HEAD
visual = log --graph --oneline --all
amend = commit --amend --no-edit
undo = reset --soft HEAD~1
wip = !git add -A && git commit -m 'WIP'
注意事项
- 提交前先拉取最新代码
- 功能分支及时合并
- 避免直接提交到 main
- 重要操作先备份
创建:2026-03-12
版本:1.0