Re:Git cherry-pick and revert use 3-way merge
by forkerenok on Friday November 10, 2023 @01:58PM
(#38222960)
Very insightful read, thanks for sharing!
I remember many cases when I was cherry-picking things on a slightly changed (with overlaps) HEAD and it just worked. So I had this intuition that it's smarter than a flat patch, but had no idea that it is a legit 3-way merge!
Slightly OT: I noticed that the git source code links in the article are referencing master branch. I think it would be better for longevity to fix a commit hash.
I remember many cases when I was cherry-picking things on a slightly changed (with overlaps) HEAD and it just worked. So I had this intuition that it's smarter than a flat patch, but had no idea that it is a legit 3-way merge!
Slightly OT: I noticed that the git source code links in the article are referencing master branch. I think it would be better for longevity to fix a commit hash.