archive228 Rebase Safely
- 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 reflogfinds the pre-rebase state;git reset --hard backup/<name>restores it.