Weave: Semantic Merge Driver for Git Uses Tree-Sitter to Resolve Code Conflicts
By
rs545837
Slow-proofed and worth the wait. Worth its weight in flour.
Summary
Weave is a semantic merge driver for Git that resolves merge conflicts by understanding code structure using tree-sitter, rather than just comparing lines. It addresses the problem where Git creates false conflicts when multiple developers or AI agents add different functions to the same file, even though the changes are independent. The tool achieved 31/31 clean merges in testing compared to Git's 15/31, demonstrating significant improvement in handling complex merge scenarios.
Key quotes
· 5 pulledResolves merge conflicts that Git can't by understanding code structure via tree-sitter.
Git merges by comparing lines. When two branches both add code to the same file — even to completely different functions — Git sees overlapping line ranges and declares a conflict.
These are completely independent changes. There's no real conflict. But someone has to manually resolve it anyway.
This happens constantly when multiple AI agents work on the same codebase. Agent A adds a function, Agent B adds a different function to the same file, and Git halts everything.
31/31 clean merges vs git's 15/31.
You might also wanna read
Why Average LLM Use Is Likely Destroying Value in Software Development
The author argues that, contrary to prevailing hype, the average use of Large Language Models (LLMs) is likely destroying value rather than
unessays.substack.com·15h ago
How AI Accelerated Prototyping: From Idea to Tangible in Record Time
The author reflects on how AI has transformed their prototyping workflow. Previously, the biggest bottleneck was the time needed to scaffold
darylcecile.net·15h ago
GitLab 19.0 launches with Secrets Manager, agentic workflows, and self-hosted AI models
GitLab 19.0 has been released, positioning itself as an intelligent orchestration platform for DevSecOps. The release includes expanded secr
bit.ly·1d ago
Centralizing Error Handling in Rust with Custom AppError Enums
This article discusses the importance of centralizing error handling in Rust applications using a custom AppError enum combined with map_err
Zig Devlog: Build System Rework Separates Maker and Configurer Processes
This devlog entry from the Zig programming language project announces a major rework of the build system, separating the maker process from
ziglang.org·1d ago
Study finds most developers refuse to code without AI, raising quality concerns
A February 2026 study by AI research lab METR reveals that most developers now refuse to work without AI coding tools. While these tools hel
techcrunch.com·1d ago