News for hackers. Stuff that matters.

A comment on Highlights from Git 2.34. Parent comment

Re:Highlights from Git 2.34 by avar on Monday November 15, 2021 @05:32PM (#29233768)
GitHub (which I'm not affiliated with) does some (all?) of their server-side merging with libgit2, not git itself, although I know they're considering moving to git with the "ort" work. So perhaps it's one of the cases where libgit2's behavior differs?
[ Parent | on HN ]
Re:Highlights from Git 2.34 by ethomson on Tuesday November 16, 2021 @09:47AM (#29241103)
That's certainly possible, but libgit2 carries an _exhaustive_ test corpus around merge as we aim to be bug-for-bug compatible with git-merge-recursive. This was also proved out by A/B testing the two at scale: https://github.blog/2015-12-15-move-fast/
[ Parent | on HN ]
Re:Highlights from Git 2.34 by beermonster on Monday November 15, 2021 @05:46PM (#29233941)
Aha, that’s useful to know. Thanks!
[ Parent | on HN ]