Entity-level semantic merge driver for Git. Two agents edit different functions in the same file? Clean merge. Every time.
$ git merge feature-b
CONFLICT (content): Merge conflict in src/lib.ts
Automatic merge failed.
bash
$ git merge feature-b
weave [src/lib.ts]:
2 entities matched, 2 modified, 0 conflicts
Merge made by the 'ort' strategy.
31 merge scenarios across 7 languages. Full breakdown →
Use just the merge driver. Or add coordination for multi-agent workflows. Full docs →
Replaces git's line-level merge. Parses code with tree-sitter, merges by function and class.
Agents claim entities before editing. Detect conflicts before they happen.
15 tools via Model Context Protocol. Claude and other AI agents call them directly.
Entity extraction powered by sem-core and tree-sitter. Plus 5 data formats. Full list →
$ brew install weave
$ cd my-project && weave setup
✓ Merge driver configured
$ git merge feature-branch
Merge made by the 'ort' strategy.
source & further reading
ataraxy-labs.github.io — original article