Re:Why large companies and fast-moving startups are banning ...
by o11c on Friday December 29, 2023 @04:17PM
(#38810310)
Rebasing generally doesn't require repeated merge conflicts though? Since the formerly conflicting commit disappears and the non-conflicting one is now baked into a linear history.
Regardless, `git rerere` is supposed to solve that problem, but I don't do enough conflicting merges to be intimately familiar with it in practice.
Re:Why large companies and fast-moving startups are banning ...
by cplusplusfellow on Friday December 29, 2023 @04:14PM
(#38810279)
I’ve known developers who left the company over the rebase mandate for this exact reason.
Re:Why large companies and fast-moving startups are banning ...
by jauntywundrkind on Friday December 29, 2023 @04:03PM
(#38810153)
Yeah it can be a bit of a pain. If you have long running branches or do keep hitting having to re-resolve, getting good at git rerere is recommended; "reuse recorded resolution"!
Having to fix the same merge conflict for each of your commits is one of the leading causes of developer burnout :D