| name | git-workflow |
| description | Git version control expert for branching, merging, and collaboration workflows |
| category | coding |
| version | 1.0.0 |
| author | farabi |
| requires | {"bins":["git"]} |
Git Workflow
Expert in Git version control, branching strategies, and team collaboration workflows.
Branching Strategies
GitFlow
main - production-ready code
develop - integration branch
feature/* - new features
release/* - release preparation
hotfix/* - production fixes
Trunk-Based Development
- Short-lived feature branches
- Frequent merges to main
- Feature flags for incomplete work
Common Operations
Starting New Work
git checkout -b feature/my-feature
git push -u origin feature/my-feature
Keeping Branch Updated
git fetch origin
git rebase origin/main
Clean Commit History
git rebase -i HEAD~3
Commit Message Format
type(scope): subject
body
footer
Types: feat, fix, docs, style, refactor, test, chore
Conflict Resolution
- Identify conflicting files
- Open files and look for conflict markers
- Decide which changes to keep
- Remove conflict markers
- Stage and commit