Hacker News new | ask | show | jobs
by Cthulhu_ 1310 days ago
Rebase is fine as long as it's your own unshared work. The alternative is https://xkcd.com/1296/
1 comments

Don't rebase main.

Don't rebase shared branches.

It's amazingly powerful at making clear annotated changes. And removing small fixup commits for work in progress.

When someone says "never do x" there's probably a missing understanding of nuance.

THIS. Rebasing and squashing local/private changes allows for easier experimentation/rollback while you're implementing. BUT, rebasing anything shared will cause pain to others and should be avoided.