Manyana: A CRDT-Based Version Control System That Eliminates Traditional Merge Conflicts
By
c17r
Master baker tier. Every paragraph earns its place on the tray.
Summary
The article introduces Manyana, a new version control system project based on Conflict-Free Replicated Data Types (CRDTs). The author argues that CRDTs provide a fundamentally sound approach to version control that eliminates traditional merge conflicts by design. The key innovation is that while CRDT merges always succeed, Manyana flags changes as conflicting when they touch each other, providing informative conflict presentation on top of a system that never actually fails. The project represents a coherent vision for the future of version control that addresses subtle UX issues that have prevented widespread CRDT adoption in this domain.
Key quotes
· 3 pulledI'm releasing Manyana, a project which I believe presents a coherent vision for the future of version control — and a compelling case for building it.
It's based on the fundamentally sound approach of using CRDTs for version control, which is long overdue but hasn't happened yet because of subtle UX issues.
A CRDT merge always succeeds by definition, so there are no conflicts in the traditional sense — the key insight is that changes should be flagged as conflicting when they touch each other, giving you informative conflict presentation on top of a system which never actually fails.
You might also wanna read
Practical Guide to Megamerge Workflows in Jujutsu Version Control
This article is a practical guide for Jujutsu (a version control system) users, focusing on the 'megamerge' workflow. It explains how to cre
isaaccorbrey.com·1mo ago
Lix: An Embeddable Version Control System for Semantic Change Tracking
Lix is an embeddable version control system designed to be imported as a library rather than replacing Git. It focuses on tracking semantic
lix.dev·4mo ago
Judo for JJ: Full-Featured GUI for JJ Version Control System
Judo for JJ is a full-featured GUI (Graphical User Interface) for JJ VCS (Version Control System) that also works with Git repositories. The
judojj.com·7mo ago
Why Average LLM Use Is Likely Destroying Value in Software Development
The author argues that, contrary to prevailing hype, the average use of Large Language Models (LLMs) is likely destroying value rather than
unessays.substack.com·11h ago
How AI Accelerated Prototyping: From Idea to Tangible in Record Time
The author reflects on how AI has transformed their prototyping workflow. Previously, the biggest bottleneck was the time needed to scaffold
darylcecile.net·11h ago
GitLab 19.0 launches with Secrets Manager, agentic workflows, and self-hosted AI models
GitLab 19.0 has been released, positioning itself as an intelligent orchestration platform for DevSecOps. The release includes expanded secr
bit.ly·23h ago