git-rebase-safe

name	git-rebase-safe
description	Rebase/squash safely without rewriting shared history unexpectedly.
compatibility	opencode
metadata	{"workflow":"git","audience":"engineers"}

What I do

• Update a feature branch onto a base branch via safe rebase.
• Help resolve conflicts and keep history clean.

When to use me

• You need to rebase your feature branch onto main (or another base).
• You need to squash/fixup before opening a PR.

Guardrails

• Never rebase main/master.
• Never rebase a branch that is known to be shared without explicit confirmation.
• Never force-push without explicit confirmation (and prefer --force-with-lease).
• Stop if the working tree is dirty (unless the user wants to stash).

Workflow

1. Confirm clean tree:
   • git status
2. Identify base branch (default: main; otherwise detect):
   • git remote show origin
3. Fetch latest:
   • git fetch --prune
4. Rebase current branch onto base:
   • git rebase origin/<base>
5. If conflicts:
   • Show conflict files: git status
   • User resolves conflicts in editor
   • Continue: git rebase --continue
   • If needed: git rebase --abort
6. Verify history:
   • git log --oneline origin/<base>..HEAD
7. Push:
   • If branch already on remote and rebase rewrote commits:
     • Ask explicit confirmation, then git push --force-with-lease
   • Else normal push.

Squash guidance (non-interactive environments)

• Prefer git reset --soft <base> + recommit ONLY if user confirms.
• Avoid git rebase -i when interactive input is not supported.

Questions I should ask if unclear

• “Is this branch already pushed / used by others?”
• “Do you want a linear history or keep merge commits?”