Git cherry-pick and revert use 3-way merge

Re:Git cherry-pick and revert use 3-way merge by test1235 on Friday November 10, 2023 @05:15PM (#38225271)

    /*
     * There's probably some smart way to do this, but I'll leave
     * that to the smart and beautiful people. I'm simple and stupid.
     */

I love that this sort of thing still exists in enterprise software

[ Parent | on HN ]

Re:Git cherry-pick and revert use 3-way merge by yencabulator on Friday November 10, 2023 @05:40PM (#38225543)

[delayed]

[ Parent | on HN ]