Pijul does both. It's a VCS, that is a CRDT, that preserves conflicts until a human resolves them. Look it up: https://pijul.org https://pijul.org It also ma

Pijul does both. It's a VCS, that is a CRDT, that preserves conflicts until a human resolves them. Look it up: https://pijul.org https://pijul.org It also makes cherrypicking and rebasing wayyyy easier. You can actually add or remove any set of patches, at any time, on any peer. It's a dramatic model shift -- and is awesome.