Re:Idiot Proof Git
by eloff on Wednesday November 09, 2022 @11:13AM
(#33533687)
I really like squash merges because then you know tests passed at every commit. Makes bisect easier, and thus more likely to be used. And no headaches when you can't rebase or you screw up a rebase, which will happen.
[ Parent
| on HN ]
> I really like squash merges because then you know tests passed at every commit. Makes bisect easier
Here is a script (just 3 lines) that tells git bisect to ignore commits in the feature branches, so you can bisect only the commits (usually the merge commits) in the main branch. Best of both worlds.
https://quantic.edu/blog/2015/02/03/git-bisect-debugging-wit...