gza-rebaselisted

# Rebase on Main Rebase the current branch onto a local target branch, resolving any merge conflicts interactively. ## Process ### Modes - Default mode: run the full flow (Steps 1-7). - `--continue` mode: assume a rebase conflict is already in progress, skip Steps 1-3, and start directly at Step 4. - In this mode, do not check for a clean working tree; the tree is expected to be dirty because of conflict markers. - If no rebase is in progress, stop and report that `git rebase --continue` cannot proceed. - `--auto` mode: unattended rebase for background workers. Same as default mode but: - Do NOT use AskUserQuestion — resolve all conflicts autonomously using best judgment. - If a conflict is truly ambiguous and cannot be resolved confidently, abort the rebase and report failure. - Treat edit-vs-delete and two-sided-modification conflicts as ambiguous unless you can preserve every still-referenced symbol with high confidence. Do not silently prefer deletion. - Uncommitted changes may be present in the working tree (e.g. leftover from an interrupted run). Stash them before rebasing and restore with `git stash pop` afterwards. - Do NOT use remote git operations. Do not run `git fetch`, `git ls-remote`, HTTPS fallback fetches, or modify git remotes/config. Use only local refs already present in the repo. If the required local target is missing, stop and report failure. ### Step 1: Pre-flight checks 1. Check for uncommitted changes (`git status --porcelain`)