Git cherry-pick and revert use 3-way merge

Re:Git cherry-pick and revert use 3-way merge by AlotOfReading on Friday November 10, 2023 @03:18PM (#38223970)

From what I understand, the local instance in fig is/was a full-on local mercurial repo, just not the entire monorepo (which doesn't leave Piper).

[ Parent | on HN ]

Re:Git cherry-pick and revert use 3-way merge by coryrc on Saturday November 11, 2023 @12:27AM (#38227887)

I suppose it must be because you can create commits which don't exist in Perforce.

[ Parent | on HN ]