There's also Jujitsu that looks a bit more interesting IMO:
https://github.com/martinvonz/jj
Or Pijul if you want to give up on Git compatibility.
https://github.com/martinvonz/jj
Or Pijul if you want to give up on Git compatibility.
And I like this idea of having an alternate model of interaction with git. It seems to fit well within the git design of having common plumbing and being able to swap out the porcelain.
"""If an operation results in conflicts, information about those conflicts will be recorded in the commit(s). The operation will succeed. You can then resolve the conflicts later. One consequence of this design is that there's no need to continue interrupted operations."""