Twitter/X

Rohan Sharma presents weave as a language-aware alternative to Git’s line-based…

2026-03-30 · 05:56 UTC ·@Palanikannan_M ·1 min read

Brief

Rohan Sharma presents weave as a language-aware alternative to Git’s line-based merge algorithm for semantic merge conflicts. He says weave uses tree-sitter to merge at the function level, eliminating false conflicts in his 31-case benchmark where Git succeeded only 15 times, and argues this matters especially for AI agents making parallel code changes.

Source evidence

title: @PalanikannanM: 2. semantic merge conflicts
- news.ycombinator.com/item?id…
- nitter.net/rs545837/status/202102…
- g...
author: @PalanikannanM
contenttype: tweet
publication: Twitter/X
published: 2026-03-30T05:56:41+00:00
sourceurl: https://x.com/Palanikannan_M/status/2038495610156818925

word_count: 115

  1. semantic merge conflicts
  • news.ycombinator.com/item?id…
  • nitter.net/rs545837/status/202102…
  • github.com/ataraxy-labs/weav…

Rohan Sharma (@rs545837)

The person who wrote git's merge algorithm just checked out weave and called it "a very reasonable way to tackle the problem." He thinks language-aware content merging is needed more than ever for agents.

I built a benchmark of 31 merge scenarios where two branches make independent, non-conflicting changes to the same file.

Git resolves 15/31 cleanly. weave resolves 31/31. Git produces false conflicts on 52% of concurrent edits to the same file. It asl fixes it for AI agents so they make fewer mistakes when working in parallel.

weave merges at the function level using tree-sitter instead of lines.

— https://nitter.net/rs545837/status/2021020365376671820#m