Weave – A language aware merge algorithm based on entities
github.com
March 4, 2026
4 min read
🔥🔥🔥🔥🔥
57/100
Summary
Weave is an entity-level semantic merge driver for Git that resolves conflicts by understanding code structure using tree-sitter. It achieves 31 out of 31 clean merges, compared to Git's 15 out of 31.
Key Takeaways
- Weave utilizes entity-level semantic merging to resolve conflicts in Git by understanding code structure through tree-sitter, resulting in 31 out of 31 clean merges compared to Git's 15 out of 31.
- Weave auto-resolves conflicts when different entities are changed, while Git produces false conflicts on independent changes within the same file.
- In tests across major open-source repositories, Weave showed zero regressions and successfully resolved conflicts that Git could not, with a human match rate of up to 64%.
- Weave provides detailed context for real conflicts, indicating the specific entity and nature of the conflict, enhancing clarity for developers.
Community Sentiment
Positives
- The language-aware content merging approach has garnered positive feedback from key figures in the Git community, indicating strong demand and potential for broader adoption.
- The ability to run AST-level queries could revolutionize how developers understand changes across branches, enhancing collaboration and reducing merge conflicts.
Concerns
- Concerns were raised about Weave's ability to detect structural refactors, which could limit its effectiveness in handling complex code changes.
- Initial testing revealed that Weave did not resolve expected merge conflicts, raising questions about its reliability in practical scenarios.
