# Ataraxy-Labs/weave

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

Repository: https://github.com/Ataraxy-Labs/weave
Canonical: https://ross.abutalabs.com/products/ataraxy-labs-weave
Homepage: https://ataraxy-labs.github.io/weave/
Language: Rust
License: Apache-2.0
License Family: permissive
Topics: ai-agents, conflict-resolution, developer-tools, mcp, merge-driver, tree-sitter, code-intelligence, coding-agents, git-merge, llm-tools
Last push: 2026-08-26T15:47:26+00:00

## Health v2 (maintenance only)
Score: 82/100 (v2, computed 2026-09-03T02:20:16.233290+00:00)
- activity 99, release rhythm 99, longevity 14
- inputs: {"age_days": 208, "days_push": 7, "days_rel": 11, "gap_med": 3.0, "n_releases_24m": 29}
- flags: none
- formula: round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10)

## Adoption (not part of the score)
Stars 1259, forks 41 (observed 2026-08-28T04:04:09.874976+00:00)

## What it is
Weave is an entity-level semantic merge driver for Git that parses code with tree-sitter and merges by functions and classes instead of lines, eliminating the false conflicts Git reports when independent edits touch different entities in the same file. It ships as a Rust CLI that drops into normal git merge/rebase/cherry-pick workflows and includes a CRDT-based entity-claiming layer plus an MCP server with 22 tools for AI coding-agent coordination, supporting 38 languages and data formats.

## Use cases
- merge conflicts when two agents edit different functions in the same file
- semantic git merge driver that understands code structure instead of lines
- reduce false git conflicts from parallel AI coding agents
- merge by function or class rather than line ranges
- tree-sitter based merge tool for git
- coordinate multiple coding agents editing one codebase
- tool to explain and verify git merge conflict stages per file

## When to choose
- You run multiple agents or developers whose edits to different functions in the same file trigger spurious git conflicts
- You want entity-level merging while keeping standard git merge, rebase, and cherry-pick workflows unchanged
- You need MCP integration so AI agents can claim entities before editing and detect conflicts early
- Your codebase spans many languages — 38 including TypeScript, Python, Go, Rust, Java, and data formats like JSON, YAML, and SQL

## When to avoid
- Merges involve genuinely overlapping edits to the same functions or classes, where weave refuses and falls back to normal conflict markers
- You require a long-proven tool at massive scale — the project is young with modest adoption (1,500+ downloads, 1259 stars)
- You only need git's default behavior and don't want to configure a custom merge driver per repository or globally

## Facets
- artifact type: cli-tool
- maturity: active
- function: version-control, developer-tools, mcp
- domain: developer-tools, version-control
- platform: cli, windows
- tags: git-merge-driver, semantic-merge, tree-sitter, conflict-resolution, coding-agents, multi-agent, mcp-server, crdt, git, entity-level-merge, ai-agents, linux, macos

## Member repositories
- Ataraxy-Labs/weave (main) score 82

## Provenance
- Observed fields: from GitHub, fetched 2026-08-28T04:04:09.874976+00:00.
- Health v2: computed from the inputs above; adoption is never an input.
- Inferred fields (summary, facets, guidance): AI-extracted, prompt v1, taxonomy v1, on 2026-08-30T05:05:27.465180+00:00, confidence not recorded.
  - readme: https://github.com/Ataraxy-Labs/weave (fetched 2026-08-28T04:04:09.874976+00:00, sha 062753b94979)
  - homepage: https://ataraxy-labs.github.io/weave/ (fetched 2026-08-29T12:16:51.475155+00:00, sha 03dbcb3c81b4)
- Data as of 2026-08-30T08:39:29.467469+00:00.