Re:Ask HN: Can we do better than Git for version control?
by bhubert on Sunday December 10, 2023 @04:50AM
(#38590442)
As far as I can tell, Pijul[0] aims to have better conflict resolution and merge correctness.
I'm not super into the theory, so I can't explain it very well, but it looks promising.
[0] https://pijul.org/