You should check out pijul.org, an alternative to systems like Git, SVN, Darcs, etc written in Rust! I really like its "no conflict" patch theory model.
1
7
11
Conversation
Pijul is quite interesting! But I’d call it “stop hiding conflicts” instead of “no conflicts”. Have a conflict that you don’t know how to resolve? Push it, and let a collaborator help you.
1
3
That's fair, "no conflicts" is a bit of an exaggeration but deferring the resolution of them makes a lot of sense to me after thinking about it for a while