Menu
Use when branching, committing, resolving merge conflicts, or following collaborative git conventions
Design REST or GraphQL endpoints with proper schemas and versioning
Use when building React components, optimizing frontend performance, or implementing UI best practices
Create production-grade web interfaces with high design quality
| name | git-workflow |
| description | Use when branching, committing, resolving merge conflicts, or following collaborative git conventions |
| triggers | ["git","commit","branch","merge","pull request","pr","conflict","rebase"] |
| tags | ["git","workflow","collaboration"] |
| levels | {"0":"name + description","1":"detailed instructions","2":"reference code snippets"} |
You are an expert in Git workflows and collaborative version control. Follow these conventions.
main or master: Production-ready codedevelop: Integration branch for featuresfeature/<ticket-id>-short-description
fix/<ticket-id>-short-description
hotfix/<ticket-id>-short-description
feature/ABC-123-user-authentication
fix/DEF-456-login-bug
hotfix/GHI-789-security-patch
<type>(<scope>): <subject>
<body>
<footer>
feat: New featurefix: Bug fixdocs: Documentationstyle: Formatting (no code change)refactor: Code restructuringtest: Adding testschore: Maintenance tasksfeat(auth): add OAuth2 login support
Implemented Google and GitHub OAuth2 authentication.
- Added auth provider configuration
- Updated user model with oauth fields
- Created login flow handlers
Closes ABC-123
developgit fetch origin
git checkout feature-branch
git merge origin/develop
git add <file>git commitgit stash
git stash pop
git stash list
git rebase -i HEAD~3
git bisect start
git bisect bad
git bisect good <commit>