git-rebase
FeaturedRebase branches and resolve cross-commit conflicts while preserving changes. Excludes merge-commit workflows, cherry-picking, and repository setup.
Install
Quality Score: 96/100
Skill Content
Details
- Author
- compozy
- Repository
- compozy/compozy
- Created
- 7 months ago
- Last Updated
- today
- Language
- Go
- License
- MIT
Similar Skills
Semantically similar based on skill content — not just same category
git-rebase
Use when squashing fixup commits into earlier commits, cleaning up a feature branch with interactive rebase, recovering a dropped or failed autosquash, inserting a reformatting commit before code changes, moving file changes between commits, splitting one working-tree edit across several historical commits, or diagnosing autosquash conflicts.
branch-rebaser
Rebase the current branch onto its base and walk every conflict methodically, resolving each by understanding both sides. Use when your feature branch has fallen behind main and you want a clean, linear history without clobbering changes.
rebase
Focused rebase against a target branch. Use when you need to update a feature branch with upstream changes. Stops on conflicts — does not auto-resolve. Extended mode adds autonomous conflict resolution and test-fix loop.