You run git rebase and suddenly you're jumping between files, manually resolving each conflict, running git add on everything - and somehow unrelated commits ends up in your PR. grebase handles the whole thing from your terminal so none of that happens.
pipx install grebase
grebase mainMost conflicts fall into a small set of deterministic cases.
See docs/conflict-resolution.md and docs/lockfiles.md for the full rules and safety details.
$ grebase main
✓ Repository detected
✓ Current branch: feature/auth-improvements
✓ Target branch: main
◆ Incoming changes — auth.py, yarn.lock
✓ import conflict in auth.py — auto-resolved
✓ yarn.lock — regenerated via yarn install
! Conflict: utils.ts — semantic change detected
1. Keep mine 2. Take theirs
3. Keep mine (all) 4. Take theirs (all)
5. Show diff 6. Skip 7. Abort
> 2
✓ Rebase complete — 3 commits applied cleanly
| Page | What's in it |
|---|---|
| Getting started | Install, first run, basic usage |
| Flags reference | Every flag explained |
| Conflict resolution | What grebase auto-resolves and how |
| Lockfiles | Per-tool commands, safety, yarn merge driver |
| Troubleshooting | Common errors and fixes |
| Contributing | Setup, tests, adding resolvers |
| Architecture | How the codebase is structured |
| Roadmap | What is planned |
MIT License · Built for devs who live in the terminal