News for hackers. Stuff that matters.
Re:Idiot Proof Git by Forge36 on Wednesday November 09, 2022 @11:03AM (#33533537)
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.

Re:Idiot Proof Git by eschneider on Wednesday November 09, 2022 @11:44AM (#33534173)
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.