{"slug": "weave-merging-based-on-language-structure-and-not-lines", "title": "Weave: Merging based on language structure and not lines", "summary": "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.", "body_md": "Entity-level semantic merge driver for Git. Two agents edit different functions in the same file? Clean merge. Every time.\n\n``` bash\n# Two agents edited different functions\n\n$ git merge feature-b\nCONFLICT (content): Merge conflict in src/lib.ts\nAutomatic merge failed.\n\n# Git sees overlapping lines.\n# The functions don't actually overlap.\nbash\n# Same merge, with weave configured\n\n$ git merge feature-b\nweave [src/lib.ts]:\n  2 entities matched, 2 modified, 0 conflicts\nMerge made by the 'ort' strategy.\n\n# Different functions = no conflict.\n```\n\n31 merge scenarios across 7 languages. [Full breakdown →](benchmarks.html)\n\nUse just the merge driver. Or add coordination for multi-agent workflows. [Full docs →](docs.html)\n\nReplaces git's line-level merge. Parses code with tree-sitter, merges by function and class.\n\nAgents claim entities before editing. Detect conflicts before they happen.\n\n15 tools via Model Context Protocol. Claude and other AI agents call them directly.\n\nEntity extraction powered by [sem-core](https://github.com/Ataraxy-Labs/sem) and tree-sitter. Plus 5 data formats. [Full list →](docs.html#languages)\n\n``` bash\n$ brew install weave\n\n$ cd my-project && weave setup\n✓ Merge driver configured\n\n$ git merge feature-branch\nMerge made by the 'ort' strategy.\n```\n\n", "url": "https://wpnews.pro/news/weave-merging-based-on-language-structure-and-not-lines", "canonical_source": "https://ataraxy-labs.github.io/weave/", "published_at": "2026-06-14 02:45:38+00:00", "updated_at": "2026-06-14 03:00:42.650660+00:00", "lang": "en", "topics": ["developer-tools", "ai-agents", "machine-learning"], "entities": ["Ataraxy Labs", "Weave", "Git", "tree-sitter", "Model Context Protocol", "Claude", "sem-core"], "alternates": {"html": "https://wpnews.pro/news/weave-merging-based-on-language-structure-and-not-lines", "markdown": "https://wpnews.pro/news/weave-merging-based-on-language-structure-and-not-lines.md", "text": "https://wpnews.pro/news/weave-merging-based-on-language-structure-and-not-lines.txt", "jsonld": "https://wpnews.pro/news/weave-merging-based-on-language-structure-and-not-lines.jsonld"}}