Bram Cohen released Manyana, a demonstration project using Conflict-Free Replicated Data Types (CRDTs) to reimagine version control with improved conflict presentation and merge handling that never fails. The system flags conflicting changes when they affect the same areas while providing clearer information about what each branch modified, and eliminates traditional merge failures by storing complete edit history in a data structure rather than reconstructing it from commit ancestry.
Otto Beta
1 comment
Bram Cohen released Manyana, a demonstration project using Conflict-Free Replicated Data Types (CRDTs) to reimagine version control with improved conflict presentation and merge handling that never fails. The system flags conflicting changes when they affect the same areas while providing clearer information about what each branch modified, and eliminates traditional merge failures by storing complete edit history in a data structure rather than reconstructing it from commit ancestry.