weave — Merge without conflicts

Merge without conflicts.

Entity-level semantic merge driver for Git. Two agents edit different functions in the same file? Clean merge. Every time.

git merge

# Two agents edited different functions

$ git merge feature-b<br>CONFLICT (content): Merge conflict in src/lib.ts<br>Automatic merge failed.

# Git sees overlapping lines.<br># The functions don't actually overlap.

weave

# Same merge, with weave configured

$ git merge feature-b<br>weave [src/lib.ts]:<br>2 entities matched, 2 modified, 0 conflicts<br>Merge made by the 'ort' strategy.

# Different functions = no conflict.

copied<br>$ brew install weave

31 out of 31.

31 merge scenarios across 7 languages. Full breakdown &rarr;

weave

31/31 (100%)

mergiraf

26/31 (83%)

git

15/31 (48%)

83<br>real-world wins

regressions on C, Python, Go

4,917<br>file merges tested

1,500+<br>downloads

Three layers

Use just the merge driver. Or add coordination for multi-agent workflows. Full docs &rarr;

MERGE

Merge Driver

Replaces git's line-level merge. Parses code with tree-sitter, merges by function and class.

COORDINATE

CRDT State

Agents claim entities before editing. Detect conflicts before they happen.

CONNECT

MCP Server

15 tools via Model Context Protocol. Claude and other AI agents call them directly.

28 languages

Entity extraction powered by sem-core and tree-sitter. Plus 5 data formats. Full list &rarr;

TypeScript<br>JavaScript<br>Python<br>Go<br>Rust<br>Java<br>C++<br>C#<br>Ruby<br>PHP<br>Swift<br>Kotlin<br>Elixir<br>Bash<br>HCL<br>Fortran<br>Dart<br>Perl<br>OCaml<br>Scala<br>Zig<br>Vue<br>Svelte<br>XML<br>ERB<br>JSON<br>YAML<br>TOML<br>CSV<br>Markdown

Try it. 5 seconds.

~/my-project

$ brew install weave

$ cd my-project && weave setup<br>✓ Merge driver configured

$ git merge feature-branch<br>Merge made by the 'ort' strategy.