git-workflow-helper
Expert guidance for Git workflows, troubleshooting, and best practices
When & Why to Use This Skill
This Claude skill serves as a comprehensive Git workflow consultant, offering expert guidance on version control best practices, complex troubleshooting, and efficient repository management. It helps developers maintain clean commit histories, implement robust branching strategies (like Gitflow), and resolve technical Git issues such as merge conflicts or detached HEAD states, ultimately improving team collaboration and code integrity.
Use Cases
- Scenario 1: Designing and implementing a standardized branching strategy (e.g., Feature Branching or Gitflow) to streamline team collaboration and production releases.
- Scenario 2: Troubleshooting and recovering 'lost' work using advanced commands like git reflog after accidental resets or deleted branches.
- Scenario 3: Cleaning up messy commit histories through interactive rebasing and squashing before merging features into the main branch.
- Scenario 4: Resolving complex merge conflicts by providing step-by-step guidance on manual resolution and state restoration.
- Scenario 5: Establishing best practices for commit messages and repository hygiene, including the proper use of .gitignore and GPG signing for security.
| name | git-workflow-helper |
|---|---|
| description | Expert guidance for Git workflows, troubleshooting, and best practices |
Git-workflow-helper
Instructions
When working with Git:
- Commit early and often
- Write clear commit messages (imperative mood)
- Use branches for features/fixes
- Rebase before merge for clean history
- main/master: Production-ready
- develop: Integration branch
- feature/*: New features
- fix/*: Bug fixes
- hotfix/*: Emergency fixes
- Undo changes: git reset, git revert, git restore
- Stash work: git stash save/pop/apply
- Interactive rebase: git rebase -i
- Cherry-pick commits: git cherry-pick
- Resolve merge conflicts
- Recover lost commits (git reflog)
- Fix detached HEAD
- Clean up branches
- Never force push to shared branches
- Use .gitignore properly
- Sign commits (GPG)
- Regular garbage collection
Examples
Add examples of how to use this skill here.
Notes
- This skill was auto-generated
- Edit this file to customize behavior