3 ms·
Hello, I see you stepped on my favourite personal soapbox! :) https://github.com/isaacs/github/issues/1017 https://github.com/isaacs/github/issues/1017 I real
by black_puppydog 4y ago
Hello, I see you stepped on my favourite personal soapbox! :)
https://github.com/isaacs/github/issues/1017 https://github.com/isaacs/github/issues/1017
I really, really like semi-linear branching/merging. I.e. always rebase-merging, but with a merge commit.
Reasons, in comparison to Github's "rebase merge" which doesn't produce a merge commit:
1. It makes it clear which commits were part of one PR
2. It makes it clear who did the merge
3. It's okay to not have every commit build. but the one being merged will.
4. Still pretty bisectable. You'll narrow things down at least to the PR that caused an issue, and from there it's usually quite simple.
5. Looks very tidy in gitk & Co