Fix git issues
Skill emaraschio/cursor-commands/.cursor/skill-contracts/fix-git-issues
Production-grade Cursor slash commands with paired skill contracts, behavioral evals, and ship-gate CI. Install as a user plugin.
npx -y skills add emaraschio/cursor-commands --skill fix-git-issuesAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 9 stars9 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
Diagnose and fix git state problems
SKILL.md
1.6 KB, as published. Nobody here has run it
Overview
Help resolve common Git problems and conflicts with step-by-step commands and explanations for each situation.
Steps
- Merge Conflicts
- Analyze conflicting changes and their context
- Provide resolution strategies for different conflict types
- Suggest the best approach to preserve important changes
- Generate resolved code maintaining functionality
- Branch Management
- Help with branch cleanup and organization
- Suggest rebasing vs merging strategies
- Assist with cherry-picking specific commits
- Guide through complex branch operations
- Commit History
- Help with commit message improvements
- Assist with squashing and organizing commits
- Guide through interactive rebase operations
- Fix commit authorship and metadata
- Repository Issues
- Help recover from detached HEAD state
- Assist with undoing commits and changes
- Guide through stash management
- Resolve submodule and remote issues
Git Issues Checklist
- Problem identified and analyzed
- Git commands provided with explanations
- Resolution strategy validated
- Changes tested and verified
- Repository state clean and functional
Guardrails
- Get explicit consent before destructive git commands (reset, rebase, or history rewrite).
- Never force-push main or a shared branch without an explicit request.
- Explain each command before running it.
- Never print or commit secrets or credential files (.env, .env.*, keys); flag any exposure instead of committing it.