| name | git-rebase |
| description | Performs git rebases with intelligent conflict resolution through commit message analysis. Use when rebasing branches, updating feature branches, resolving rebase conflicts, or cleaning up commit history. |
Git Rebase Assistant
Performs safe, effective rebases with intelligent conflict detection and resolution.
Core Principle: Intent Before Resolution
Never resolve a conflict mechanically. Before touching any conflict:
- Understand what master/main changed and WHY
- Understand what the feature branch changed and WHY
- Only then decide how to combine the changes
Workflow
- Validate prerequisites (
git status must be clean)
- Create safety backup branch
- Gather context with
git log on both sides
- Execute rebase
- Handle conflicts with intent-first approach
- Verify and push
See references/ for detailed conflict analysis and ours-vs-theirs guidance.