5 ms·
This - even 5 devs. Also rebasing is just so fraught with potential errors - every month or two, the devs who were rebasing would screw up some feature branch
by mattbillenstein 10mo ago
This - even 5 devs.
Also rebasing is just so fraught with potential errors - every month or two, the devs who were rebasing would screw up some feature branch that they had work on they needed and would look to me to fix it for some reason. Such a time sink for so little benefit.
I eventually banned rebasing, force pushes, and mandated squash merges to main - and we magically stopped having any of these problems.
- esafak 10mo agoRebase before creating PR, merge after creating PR.
- William_BB 10mo agoWe squash, but still rebase. For us, this works quite well. As you said, rebasing needs to be done carefully... But the main history does look nice this way.
- mattbillenstein 10mo agoWhy bother with the rebase if you squash anyway? That history just gets destroyed?