I mentioned Loro in another comment, but they actually do conflict resolution on top of Git trees [0]. Jujutsu is also interesting but I'm not sure if they do a

I mentioned Loro in another comment, but they actually do conflict resolution on top of Git trees [0]. Jujutsu is also interesting but I'm not sure if they do any conflict resolution [1]. [0] https://loro.dev/blog/v1.0#loro-version-controller https://loro.dev/blog/v1.0#loro-version-controller [1] https://github.com/martinvonz/jj https://github.com/martinvonz/jj