git-workflow
Manage Git branches, commits, and pull requests following best practices
When & Why to Use This Skill
This Claude skill automates and standardizes Git operations, including branch management, commit messaging, and pull request workflows. By enforcing industry best practices like Conventional Commits and structured branching strategies (feature/bugfix/hotfix), it helps development teams maintain a clean version control history, reduce merge conflicts, and streamline the collaborative coding process.
Use Cases
- Standardized Branching: Automatically create and name branches for new features, bug fixes, or releases to ensure repository consistency and organization.
- Conventional Commit Automation: Generate structured, meaningful commit messages that follow industry standards, making project histories easier to audit and changelogs simpler to generate.
- Pull Request Lifecycle Management: Streamline the PR process by managing rebases with the main branch, handling merge conflicts, and verifying pre-merge checklists to ensure code quality.
- Workflow Enforcement: Guide junior developers or teams through complex Git workflows, ensuring that best practices like feature branching and proper documentation are followed consistently.
| name | git-workflow |
|---|---|
| description | Manage Git branches, commits, and pull requests following best practices |
Git Workflow
Manage Git operations and follow branching best practices.
Capabilities
- Create and manage feature branches
- Write meaningful commit messages
- Handle merge conflicts
- Create and review pull requests
Branch Naming
feature/ - New features (feature/add-user-auth)
bugfix/ - Bug fixes (bugfix/fix-login-error)
hotfix/ - Urgent production fixes (hotfix/security-patch)
release/ - Release preparation (release/v1.2.0)
Commit Message Format
<type>(<scope>): <subject>
<body>
<footer>
Types
feat: New featurefix: Bug fixdocs: Documentationrefactor: Code refactoringtest: Adding testschore: Maintenance
Example
feat(auth): add OAuth2 login support
- Implement Google OAuth2 provider
- Add token refresh mechanism
- Store tokens securely in session
Closes #123
Common Workflows
Feature Branch
git checkout -b feature/new-feature
# ... make changes ...
git add .
git commit -m "feat: add new feature"
git push -u origin feature/new-feature
# Create PR
Sync with Main
git checkout main
git pull origin main
git checkout feature/my-feature
git rebase main
PR Checklist
- Tests pass
- Code reviewed
- Documentation updated
- No merge conflicts