Weave – A language aware merge algorithm based on entities • Hacker News Board

Some context on the validation so far: Elijah Newren, who wrote git's merge-ort (the default merge strategy), reviewed weave and said language-aware content merging is the right approach, that he's been asked about it enough times to be certain there's demand, and that our fallback-to-line-level strategy for unsupported languages is "a very reasonable way to tackle the problem." Taylor Blau from the Git team said he's "really impressed" and connected us with Elijah. The creator of libgit2 starred the repo. Martin von Zweigbergk (creator of jj) has also been excited about the direction. We are also working with GitButler team to integrate it as a research feature.

The part that's been keeping me up at night: this becomes critical infrastructure for multi-agent coding. When multiple agents write code in parallel (Cursor, Claude Code, Codex all ship this now), they create worktrees for isolation. But when those branches merge back, git's line-level merge breaks on cases where two agents added different functions to the same file. weave resolves these cleanly because it knows they're separate entities. 31/31 vs git's 15/31 on our benchmark.

Weave also ships as an MCP server with 14 tools, so agents can claim entities before editing, check who's touching what, and detect conflicts before they happen.

Re: Weave – A language aware merge algorithm based on entities

#7

Post by rs545837 » Wed, Mar 04, 2026, 3:15 AM UTC

esafak wrote: post #4

Are agents any good with it?

Yes I designed it for agents especially, there's also weave mcp that I built that you can checkout.

The good part is that this research extends really good for code review because tracking entities is more semantically rich than lines.

Re: Weave – A language aware merge algorithm based on entities

#8

Post by rs545837 » Wed, Mar 04, 2026, 3:16 AM UTC

kelseydh wrote: post #5

Very cool, would love to see Ruby support added.

Thanks for the request, our team is already working on it, and infact we were going to ship ruby tonight!

Cheers,

Re: Weave – A language aware merge algorithm based on entities

#9

Post by rs545837 » Wed, Mar 04, 2026, 3:17 AM UTC

sea-gold wrote: post #3

Website: https://ataraxy-labs.github.io/weave/ I haven't tried it but this sounds like it would be really valuable to me.

Haha, thanks for the feedback, yeah multi agent workflows were especially kept in mind when designing this! So I hope it helps, I am always here for feedback and feature requests.

Re: Weave – A language aware merge algorithm based on entities

#10

Post by keysersoze33 » Wed, Mar 04, 2026, 3:20 AM UTC

Interesting that Weave tries to solve Mergiref's shortcomings (also Tree-sitter based):

> git merges lines. mergiraf merges tree nodes. weave merges entities. [1]

I've been using mergiraf for ~6 months and tried to use it to resolve a conflict from multiple Claude instances editing a large bash script. Sadly neither support bash out of the box, which makes me suspect that classic merge is better in this/some cases...

Will try adding the bash grammar to mergiraf or weave next time

[1] https://ataraxy-labs.github.io/weave/