Bram Cohen Thinks Git Is a Dead End. Here's His Alternative.

2 min read 1 source explainer

Bram Cohen — yes, the BitTorrent inventor — has published a detailed manifesto on what version control should look like after Git. The post, titled "Mañana," lays out a coherent technical vision that's been simmering for years through his work on version control theory.

The core argument: Git won by being fast and distributed, but its internal model is fundamentally flawed in ways that compound as repositories and teams scale. Merge algorithms produce silent wrong results. History is append-only in theory but a tangled mess requiring regular rewriting in practice. The UX is a famously hostile layer of incidental complexity over a content-addressable filesystem that was never designed to be user-facing.

Cohen's vision centers on getting the foundational data structures right — specifically, building merge and history semantics that are mathematically sound rather than heuristic-based. If you've followed his earlier writing on patch theory (influenced by Darcs and Pijul's approach), this is the logical culmination: a system where merges are commutative and associative by construction, not by luck.

What makes this more than another "Git replacement" blog post is the author's track record. Cohen doesn't just theorize about distributed systems — he built the protocol that proved decentralized file distribution works at planetary scale. When he says the version control problem has a cleaner solution, the claim carries weight.

The 259-point Hacker News reception suggests the developer community is at least listening. And they should be. Git's dominance isn't because it's good — it's because it's good enough and everything else is worse. The last serious challenger, Mercurial, lost not on technical merit but on ecosystem momentum. Any post-Git system needs to clear a much higher bar than "better merge algorithm" — it needs a migration story, GitHub-tier tooling, and a reason to switch that developers feel in their daily workflow.

Cohen appears to understand this. The vision isn't just about cleaner internals — it's about what those cleaner internals enable at the surface: simpler mental models, fewer footguns, and operations that do what you actually meant.

Whether Mañana ships as usable software or remains an influential design document, it's the most technically serious post-Git proposal from someone with the credentials to back it up. Worth reading in full if you've ever lost an afternoon to a rebase gone wrong — which is to say, worth reading.

Hacker News 640 pts 361 comments

A Coherent Vision for the Future of Version Control

→ read on Hacker News
ulrikrasmussen · Hacker News

The thing about how merges are presented seems orthogonal to how to represent history. I also hate the default in git, but that is why I just use p4merge as a merge tool and get a proper 4-pane merge tool (left, right, common base, merged result) which shows everything needed to figure out why there

theknarf · Hacker News

You can't use CRDTs for version control, having conflicts is the whole point of version control. Sometimes two developers will make changes that fundamentally tries to change the code in two different ways, a merge conflict then leaves it up to the developer who is merging/rebasing to make

Koshkin · Hacker News

What's currently missing from the automatic conflict resolution is intelligence. The AI doing merges is the future.

radarsat1 · Hacker News

Is it a good thing to have merges that never fail? Often a merge failure indicates a semantic conflict, not just "two changes in the same place". You want to be aware of and forced to manually deal with such cases.I assume the proposed system addresses it somehow but I don't see it in

barrkel · Hacker News

I don't really get the upside of focus on CRDTs.The semantic problem with conflicts exists either way. You get a consistent outcome and a slightly better description of the conflict, but in a way that possibly interleaves changes, which I don't think is an improvement at all.I am completel

// share this

// get daily digest

Top 10 dev stories every morning at 8am UTC. AI-curated. Retro terminal HTML email.