Ataraxy-Labs/weave

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

What it solves

Git's default line-based merge often creates "false conflicts" when two developers (or AI agents) add independent code—such as different functions—to the same file. Weave eliminates these unnecessary manual resolutions by understanding the actual structure of the code rather than just the lines it occupies.

How it works

Weave acts as a semantic merge driver for Git. It uses tree-sitter to parse files into "entities" (like functions, classes, or JSON keys) and matches them across the base, local, and remote versions of a file.

Instead of diffing lines, it merges at the entity level: if two different entities were changed, it auto-resolves them; if the same entity was changed by both, it attempts an intra-entity merge or flags a semantic conflict with clear context. It falls back to standard line-level merging for binary files, unsupported types, or files larger than 1MB.

Who it’s for

Software developers and teams using Git, particularly those employing multiple AI agents to modify the same codebase, who want to reduce the time spent resolving trivial merge conflicts.

Highlights

  • Entity-level resolution: Auto-resolves independent changes to the same file that would normally trigger Git conflicts.
  • Broad language support: Supports a wide array of languages including TypeScript, Python, Go, Rust, Java, C, C++, and various configuration formats like JSON and YAML.
  • Semantic conflict markers: Provides descriptive markers (e.g., function 'process' (both modified)) when a real conflict occurs.
  • High accuracy: Benchmarked against real-world open-source repositories with zero regressions reported.