rebase-origin-main
Rebase with origin/main
Overview
Fetches the latest origin/main, rebases the current branch onto it, and resolves every conflict that arises — one commit at a time — until the rebase completes cleanly.
Warning: Rebase Flips ours/theirs
During a rebase, git's labels are inverted from what you expect:
| Label | Means |
|---|---|
HEAD / ours (top of conflict) |
origin/main — the base being rebased onto |
theirs (bottom of conflict) |
Your commit being replayed |
Always resolve conflicts to preserve the intent of your commit while incorporating origin/main's context.
Workflow
More from reviewstage/stage-cli
stage-chapters
Generate Stage chapters for the current local git branch and open them in a browser for review.
121fixing-ci
Use when CI is failing on a branch and you need to diagnose failures from GitHub, fix them locally with iterative verification, and re-push clean commits.
1trade-off
Use at any stage — planning, before implementing, or reviewing code that's already written — to surface high-level trade-offs that could significantly simplify the work. Scans two layers in strict priority order. First, user-facing behavior (features, flows, states, settings, notifications, undo, real-time, bulk ops) — cutting a behavior removes the architecture and code behind it. Second, architectural design (queues, caches, background jobs, new packages, new tables, new services, streaming, real-time infra) — cutting an architectural piece removes whole categories of implementation. Stops there; code-level simplification is outside scope. Proactively invoke whenever the scope of a task looks like it could grow, whenever you catch yourself about to add a queue, cache, new package, new table, new service, or behavior that wasn't explicitly requested, or when looking back at a recent diff that feels larger than the task warranted.
1linear-issue
Use when creating a Linear issue from the current coding context, or when the user invokes /linear-issue. Infers team, priority, status, and relationships from conversation context, working directory, and git branch.
1deslop-ui
Use when building or reviewing UI components, pages, or layouts to ensure premium, intentional design that never looks vibe coded
1quality-review
Use when reviewing code changes against AGENTS.md implementation quality standards, or when asked to do an implementation quality review
1