Re:Why large companies and fast-moving startups are banning ...
by burntsushi on Friday December 29, 2023 @04:50PM
(#38810647)
Why do you need to squash & merge literally every PR? Why not use squash & merge when appropriate and rebase & merge otherwise? That's what I do for my projects. Most contributions coming from others tend to get squashed & merged, where as I'll rebase & merge my commits. But I'll sometimes rebase & merge PRs from other contributors who have broken their change down into thoughtful commits.
[ Parent
| on HN ]
Re:Why large companies and fast-moving startups are banning ...
by alphazard on Friday December 29, 2023 @05:49PM
(#38811153)
> Why do you need to squash & merge literally every PR? Why not use squash & merge when appropriate and rebase & merge otherwise?
"When appropriate" is the key here. That's asking people to make a decision, take on additional cognitive load, which does not have a clear deliverable or success criteria. In practice the default is what happens.
Re:Why large companies and fast-moving startups are banning ...
by burntsushi on Friday December 29, 2023 @06:54PM
(#38811595)
We need to make decisions about code and maintainability all the time. I don't see why this is any different.
Re:Why large companies and fast-moving startups are banning ...
by rokkitmensch on Friday December 29, 2023 @10:16PM
(#38812562)
Every opportunity to eliminate cognitive overhead is a win for the team.
As I say to my children on the reg, "What's the best way to clean up a mess? Don't make it in the first place."
Re:Why large companies and fast-moving startups are banning ...
by brayhite on Friday December 29, 2023 @11:54PM
(#38812914)
As my children repeatedly prove: one person’s “not a mess” is another person’s disorganized chaos.
Re:Why large companies and fast-moving startups are banning ...
by burntsushi on Saturday December 30, 2023 @08:01AM
(#38814970)
Telling my child not to make a mess so he can avoid cleaning it up would not be an effective tactic at anything other than acting smug.
You're presupposing that this decision is worth making for programmers in the first place. I don't see why that ought to be true.
Re:Why large companies and fast-moving startups are banning ...
by kdmccormick on Friday December 29, 2023 @04:57PM
(#38810718)
This is it. The real answer to this whole debate is "it depends" but for some reason that doesn't seem to satisfy people.
Re:Why large companies and fast-moving startups are banning ...
by rokkitmensch on Friday December 29, 2023 @10:19PM
(#38812573)
The effective management approach (in opposition to the limp-souled "servant leader" anemia) is to make decisions for your team to eliminate stupid work.
What, you're going to let anyone waste time on tabs versus spaces?
Re:Why large companies and fast-moving startups are banning ...
by burntsushi on Saturday December 30, 2023 @07:55AM
(#38814930)
You've presupposed that this is all about stupid stuff in the first place. Moreover, mixing tabs and spaces for indentation leads to sadness. But squash and rebase are perfectly compatible with over another.
Programmers sometimes have to decide stuff. That's okay.