Top AI Product

If you’ve ever spent twenty minutes untangling a merge conflict that shouldn’t have been a conflict at all, you already know the pain [Weave](https://github.com/Ataraxy-Labs/weave) is trying to solve. Two developers add separate functions to the same file, and Git loses its mind because the line ranges overlap. It’s 2026, and we’re still dealing with this.

Weave, built by Ataraxy Labs, takes a fundamentally different approach. Instead of comparing files line by line, it uses tree-sitter to parse your code into actual semantic entities — functions, classes, methods, JSON keys, whatever makes sense for the language. Then it performs a 3-way merge at that entity level. If you added a function at the top of the file and your teammate added one at the bottom, Weave just merges them cleanly. No conflict marker in sight.

The numbers are honestly kind of wild. In their test suite against real open-source repos, Git could only auto-merge 15 out of 31 scenarios. Weave handled all 31 with zero regressions. They also ran it against larger repos like Git itself (the C codebase) and Flask, getting 39 and 14 wins respectively, again with zero regressions. That’s not a marginal improvement — it’s a whole category of annoying conflicts just gone.

It [hit the Hacker News front page](https://news.ycombinator.com/item?id=47241976) recently and the discussion was genuinely interesting. Elijah Newren, who created Git’s merge-ort algorithm, actually endorsed the approach. Martin von Zweigbergk from the Jj project chimed in too. One thread that stood out was around multi-agent coding — when you have multiple AI agents editing the same file, these false conflicts become a real bottleneck, and Weave basically eliminates them.

Setup is straightforward: it’s written in Rust, so you build it with cargo and run `weave-cli setup`. It hooks into Git via `.gitattributes`, meaning you don’t have to change your workflow at all. It currently supports TypeScript, JavaScript, Python, Go, Rust, JSON, YAML, TOML, and Markdown. For anything it doesn’t recognize, it falls back to standard line-level merging, so nothing breaks.

There’s also a neat preview feature — `weave-cli preview feature-branch` lets you dry-run a merge before committing to it, which is the kind of cautious workflow I appreciate. The project is dual-licensed under Apache-2.0 and MIT, sitting at around 295 stars on GitHub and climbing. Worth keeping an eye on if merge conflicts are a regular source of friction in your team.