| name | rebase-main |
|---|---|
| description | Safely update the local main branch with a fast-forward-only pull, rebase the current work branch onto it, resolve conflicts without losing local work, and restore staged, unstaged, and untracked changes. Use when the user asks to pull main and rebase the current branch, update a branch from main, remove rebase conflicts, or says "rebase-main". |
The canonical workflow lives in .codex/skills/rebase-main/SKILL.md. Read and
follow it completely, including its working-tree safeguard, conflict-resolution,
restoration, verification, and no-implicit-push rules.