Mergiraf: A syntax-aware git merge driver for a growing collection of programming languages and file formats
Summary
Mergiraf is a syntax-aware Git merge driver that enhances merge handling for a variety of programming languages and file formats.
Similar Articles
Weave: Merging based on language structure and not lines
Weave is an entity-level semantic merge driver for Git that resolves conflicts by parsing code with tree-sitter, merging functions and classes instead of lines. It supports 28 languages and offers additional coordination and MCP server features for multi-agent workflows.
Jujutsu megamerges for fun and profit
A technical guide explaining the 'megamerge' workflow in Jujutsu, a version control system alternative to Git, which leverages octopus merges (commits with 3+ parents) to manage multiple concurrent branches and development contexts efficiently.
weave: structural merging for different languages
Weave is a Git extension that performs entity-level semantic merging to resolve conflicts by parsing code into functions, classes, and keys using tree-sitter, especially useful for AI-driven development.
I turned Git into a shared context layer for engineering teams and multiple claude code sessions
The author developed an open-source project called MEX that uses Git as a shared memory layer for coding agents, allowing context to be version-controlled and shared among engineering teams.
How would you catch two agents about to make incompatible changes when there is no Git underneath?
The author describes Foremerge, an open-source coordination protocol for parallel coding agents that detects conflicts before changes are made, and explores its applicability to non-code domains while seeking real-world examples.