emaraschio 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.