7 ms·
Good luck getting 100+ devs to all use the same logical commit style. And if tests fail in CI you get the inevitable "fix tests" commit in the branch, which now
by trevor-e 9mo ago
Good luck getting 100+ devs to all use the same logical commit style. And if tests fail in CI you get the inevitable "fix tests" commit in the branch, which now spams your main branch more than the meaningful changes. You could rebase the history by hand, but what's the point? You'd have to force push anyway. Squashing is the only practical method of clean history for large orgs.
- mattbillenstein 9mo agoThis - 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 9mo agoRebase before creating PR, merge after creating PR.
- William_BB 9mo 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 9mo agoWhy bother with the rebase if you squash anyway? That history just gets destroyed?
- Denvercoder9 9mo ago> Good luck getting 100+ devs to all use the same logical commit style The Linux kernel manages to do it for 1000+ devs.