The future of version control(bramcohen.com)
640 points by c17r | 360 comments
Bram Cohen's Substack post announcing Manyana, a project presenting a vision for CRDT-based version control that rethinks how merge conflicts are flagged.
#merge-conflicts on Hacker News
2 stories tagged merge-conflicts, newest first.
Mergiraf: a syntax-aware merge driver for Git(mergiraf.org)
394 points by p4bl0 | 81 comments
Documentation homepage for Mergiraf, a syntax-aware Git merge driver that resolves merge conflicts using knowledge of language syntax trees.