Weave: Merging based on language structure and not lines

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

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.

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 →

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

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.