Name: Rebase
Author: api-haus

Workflow context: This is step 1 of completing a feature. The full sequence is: /rebase → manual verification → /merge

Rebasing ensures clean, linear history on main by replaying feature commits on top of the latest main.

Rebase the current worktree's branch onto the latest main branch.

Pre-flight checks

Run git status to check for uncommitted changes
If uncommitted changes exist:
- Ask user whether to commit, stash, or abort
- Do NOT proceed until working tree is clean
Fetch latest from main worktree (no network fetch needed - it's local)

Rebase

Get current branch name: git branch --show-current
Rebase onto main: git rebase main
If conflicts occur:
- Show conflicted files:

Workflow context: This is step 1 of completing a feature. The full sequence is: /rebase → manual verification → /merge

Rebasing ensures clean, linear history on main by replaying feature commits on top of the latest main.

Rebase the current worktree's branch onto the latest main branch.

Pre-flight checks

Run git status to check for uncommitted changes
If uncommitted changes exist:
- Ask user whether to commit, stash, or abort
- Do NOT proceed until working tree is clean
Fetch latest from main worktree (no network fetch needed - it's local)

Rebase

Get current branch name: git branch --show-current
Rebase onto main: git rebase main
If conflicts occur:
- Show conflicted files:

Rebase

Pre-flight checks

Rebase

Rebase

Pre-flight checks

Rebase

Post-rebase

Notes

Coding Agent (bash-first)

Fix

Commit

Init

Github Copilot Upgrader

Rebuilding Flutter Tool