News for hackers. Stuff that matters.
Re:Commits are snapshots not diffs (2020) by mschuster91 on Thursday April 08, 2021 @02:39PM (#26742204)
> A lot of people are scared of rebase and cherrypick and shut down or get defensive when you mention them or try to encourage their use.

Because a lot of people have been burned and way too many hours been lost due to a rebase gone wrong. Cherry-pick and stash are trivial operations, reset (outside of "undo a git add") and especially rebase are not.

The learning curve for both is steep, the potential for failure extremely high, so I understand why organizations go as far as entirely banning rebase.

Re:Commits are snapshots not diffs (2020) by zo1 on Thursday April 08, 2021 @03:06PM (#26742494)
People are scared of rebase because of the constant scare-mongering around it. "Rebase is Evil" and "Never use Rebase", etc. Then we end up with junior devs that are too-scared to even use their git IDE's built-in rebase-remote branch onto remote so they end up littering the entire repo with "Merged branch-A from origin into branch-A".

It's so bad that even seasoned developers that haven't delve deeply into git have no idea that this sort of rebase is practically harmless. Instead they parrot "Rebase is Evil" without thinking twice.