Menu

📰
0

weave — Merge without conflicts

ataraxy-labs.github.io·4 months ago
#v3UZ4r3Z
Reading 0:00
15s threshold

weave 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. copied $ brew install weave 31 out of 31. 31 merge scenarios across 7 languages. Full breakdown → 83 real-world wins 0 regressions on C, Python, Go 4,917 file merges tested 1,500+ downloads Three layers Use just the merge driver. Or add coordination for multi-agent workflows. Full docs → 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.…

Continue reading — create a free account

Join HashtagPLUS to read full articles, follow hashtags, vote, and join the conversation.

Read More