developer-tools git code-merging tree-sitter

Weave – A language aware merge algorithm based on entities

GitHub - Ataraxy-Labs/weave: Entity-level semantic merge driver for Git. Resolves conflicts that git can't by understanding code structure via tree-sitter. 31/31 clean merges vs git's 15/31.

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.

Read original article

View story →

Coverage & discussions

Hacker News · github.com

Weave – A language aware merge algorithm based on entities ↗

Community discussions

Hacker News discussion ↗

Historical count: 5 · 5 saved in sample · Historical sample

Analysis ready

Community Sentiment

Mixed

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.