Rebase Safely

SkillDev tools

Rebase, squash, or rewrite history without losing work or breaking shared branches. Use before any history rewrite.

Available today. Use it from your connected AI after setup.

No other account needed.

Connect ahel once, and every AI you use reads what you have installed.

Then ask your AI: use the Rebase Safely skill

What this skill tells your AI

The instructions your AI receives, as published by archive228/loopkit in skills/rebase-safely/SKILL.md and read by ahel’s review.

Backup first — git branch backup/<name> before any rewrite. Free undo.
Rebase onto the latest base: git fetch; git rebase origin/main.
Resolve conflicts one commit at a time. Test after the rebase, not just that it "completed".
Never rewrite shared history — if others pulled the branch, rebasing it forces them into pain. Rewrite only your own un-pushed/un-shared commits.
Push with --force-with-lease, never bare --force (lease refuses if someone else pushed). If anything goes sideways: git reflog finds the pre-rebase state; git reset --hard backup/<name> restores it.

Advanced