Git cherry-pick and revert use 3-way merge

Submitted ⁨⁨1⁩ ⁨year⁩ ago⁩ by ⁨bot@lemmy.smeargle.fans [bot]⁩ to ⁨hackernews@lemmy.smeargle.fans⁩

https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/