Weave: Merging based on language structure and not lines

Weave, a new Git merge driver from Ataraxy Labs, resolves merge conflicts by parsing code structure with tree-sitter and merging at the function or class level instead of by lines. It supports 31 merge scenarios across 7 languages and integrates with AI agents via the Model Context Protocol, enabling conflict-free collaboration for multi-agent workflows.

Entity-level semantic merge driver for Git. Two agents edit different functions in the same file? Clean merge. Every time. bash Two agents edited different functions $ git merge feature-b CONFLICT content : Merge conflict in src/lib.ts Automatic merge failed. Git sees overlapping lines. The functions don't actually overlap. bash Same merge, with weave configured $ git merge feature-b weave src/lib.ts : 2 entities matched, 2 modified, 0 conflicts Merge made by the 'ort' strategy. Different functions = no conflict. 31 merge scenarios across 7 languages. Full breakdown → benchmarks.html Use just the merge driver. Or add coordination for multi-agent workflows. Full docs → docs.html 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 https://github.com/Ataraxy-Labs/sem and tree-sitter. Plus 5 data formats. Full list → docs.html languages bash $ brew install weave $ cd my-project && weave setup ✓ Merge driver configured $ git merge feature-branch Merge made by the 'ort' strategy.