branch-rebase
Safely rebase the current branch onto its upstream target, auto-resolving trivial conflicts and prompting for complex ones. Use when the user says "rebase", "rebase onto main", "update my branch", "sync with baseline", "catch up with main", or invokes /branch- rebase.
- Compatibility
- claude-code codex opencode
Pinned to revision e1f0a00e06d5, so it is the text this page describes rather than whatever the author pushed since.
Files
- skills/branch-rebase/SKILL.md
- skills/branch-rebase/CONFLICTS.md
- skills/branch-rebase/README.md
- skills/branch-rebase/VERSIONING.md
- skills/branch-rebase/agents/openai.yaml
Every link opens the file at its source, pinned to the revision this page describes.