Re:Git cherry-pick and revert use 3-way merge
by coryrc on Friday November 10, 2023 @03:08PM
(#38223851)
Fig is an abstraction over top of Perforce. Before fig was a git-UI-based tool and it is gone. Mercurial's interface is way better than git.
The fact that Mercurial does not scale to a Google-sized monorepo is not an indictment of Mercurial.
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).
I didn't mind mercurial, but I think it's telling that even the tech behemoths championing it like Google and Facebook forked off into their own tools (fig/sapling). The latter even supports git directly. That battle is long over.
[0] https://github.com/martinvonz/jj