{"repo":"Ataraxy-Labs/weave","free":true,"listed":false,"github":"https://github.com/Ataraxy-Labs/weave","clone":"git clone https://github.com/Ataraxy-Labs/weave.git","description":"Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.","language":"Rust","stars":1254,"topics":["ai-agents","conflict-resolution","developer-tools","mcp","merge-driver","tree-sitter","code-intelligence","coding-agents","git-merge","llm-tools"],"license":"Apache-2.0","category":"mcp-servers","readme_excerpt":"Part of the Ataraxy Labs stack — agent-native infrastructure for software development. See also: sem (semantic version control) · inspect (semantic code review) · opensessions (tmux sidebar for coding agents). Read the manifesto: https://ataraxy-labs.com/#thesis · Essays: https://ataraxy-labs.com/blogs · LLMs: https://ataraxy-labs.com/llms.txt Entity-level semantic merge driver for Git. Resolves merge conflicts that Git can't by understanding code structure via tree-sitter. Install · Quickstart · How It Works · MCP Server · Releases Quickstart See Setup for --global / --local variants and MCP Server for agent-framework integration. The Problem Git merges by comparing lines . When two branches both add code to the same file — even to completely different functions — Git sees overlapping line ranges and declares a conflict: These are completely independent changes . There's no real conflict. But someone has to manually resolve it anyway. This happens constantly when multiple AI agents work on the same codebase. Agent A adds a function, Agent B adds a different function to the same file, and Git halts everything for a human to intervene. How Weave Fixes This Weave replaces Git's line-based merge with entity-level merge . Instead of diffing lines, it: 1. Parses all three versions (base, ours, theirs) into semantic entities — functions, classes, JSON keys, etc. — using tree-sitter 2. Matches entities across versions by identity (name + type + scope) 3. Merges at the entity level: ","default_branch":null,"files":null,"tree":[],"storefront":"/r/Ataraxy-Labs","claimed":false,"request_supported":{"post":"https://gitbuyer.com/r/Ataraxy-Labs/weave/request-supported","requests":0},"note":"indexed from public GitHub; nothing is for sale on this page. Clone it from GitHub. Paid listings live at /search."}