News for hackers. Stuff that matters.
Re:Git cherry-pick and revert use 3-way merge by Tyr42 on Friday November 10, 2023 @02:32PM (#38223418)
Also check out the New Old Thing for more gnarly git examples.

Raymond Chen is excellent.

Re:Git cherry-pick and revert use 3-way merge by Quekid5 on Friday November 10, 2023 @07:07PM (#38226214)
Raymond Chen's blog is a gift to this world.