3 ms·
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
by eloff 4y ago
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.
- sampo 4y ago> 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-with-feature-branches/ https://quantic.edu/blog/2015/02/03/git-bisect-debugging-wit...