> As a trivial counter example Git does not currently have a way to store conflicts inside commits[1], which is one of our major features.

Yes, I like how jj does it!

Did a big `git rebase -i` yesterday and I felt stressed up, almost a bit angry, when there were some conflicts and I wasn't sure if I'd resolve all of them before it was time to leave, and work more later from a different laptop.

But with jj, no stress: I can just check in the conflicts, and later, on the other laptop: check out the conflicts and continue resolving.

(I just wish there was Git submodule support :- ))