Yes, came here to plug Pijul as well: for distributed version control, the "first-class conflicts" of Pijul seems to be a step in the right direction.

For anyone who hasn't looked at Pijul, the theory part of the documentation [0] is well worth a read.

[0]: https://pijul.org/manual/theory.html

How production-ready is Pijul? I heard about it some time ago and was super impressed. But apparently at the time it had issues, and was going to be re-written in a different language.

Wow, you heard about Pijul years ago then.

I believe it is production-ready, in the sense that there hasn't been any real bug in months. I'll remove the "beta" label when more people use it.

One thing that isn't production-ready is nest.pijul.com, but mostly for lack of funding: that platform uses the CRDT nature of Pijul to replicate all the repositories in different datacenters, but the machines it runs on are somewhat undersized, and the PostgreSQL databases don't like that very much.

But you don't need that to use Pijul, a simple SSH server works fine.

I did not expect to get an answer from you directly :) I will definitely try it out with my next project!