I’m delighted by jujutsu vcs, it harnesses all of the power of git in a vastly improved experience, while also managing to address some core issues (conflicts are actually first class, modeled entities). Worth a read - v5.chriskrycho.com/essays/jj-in...
v5.chriskrycho.com
jj init — Sympolymathesy, by Chris Krycho
Jujutsu (`jj`) is a new version control system from a software developer at Google. I have been using it full time for 6 months. Here’s why you should switch, too.