3 ms·
Master or any branch you're aiming to integrate into. Squashing everything is bad because it makes code review and backports harder. Maybe you don't care abou
by cryptonector 5y ago
Master or any branch you're aiming to integrate into.
Squashing everything is bad because it makes code review and backports harder. Maybe you don't care about backports, but if you care about code reviews...
- quickthrower2 5y agoWe code review unsquashed branches. Honestly I just diff the whole thing from where they branched to the tip anyway I rarely find the individual commits useful as there is usually a process of their discovery in that with backtracks etc. that’s a waste of time to review. For example I could review a new class that they heavily refactored in the next commit. I’ve not had an issue with code reviews or backporting. I suspect this is because either out units of work are smaller than usual (no long feature branches) But maybe you are onto something here and I’m missing out on a better way but I’ve not experienced enough pain in squashing on merge to master to contemplate switching to a rebase workflow (which means convincing team members too)