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. observed · 2026-08-28
Health v2 · maintenance only
82/100
- Activity 99
- Release rhythm 99
- Longevity 14
How is this computed?
round(0.45*activity + 0.35*rhythm + 0.20*longevity); archived -> min(score, 10) — computed 2026-09-03. Adoption (stars, forks) is never an input.
- gap_med: 3.0
- age_days: 208
- days_rel: 11
- days_push: 7
- n_releases_24m: 29
Adoption not part of the score
1259 stars · 41 forks observed · 2026-08-28
What it is AI-extracted, prompt v1, taxonomy v1, 2026-08-30, confidence not recorded
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
cli-tool · maturity active
version-control developer-tools mcp developer-tools version-control cli windows git-merge-driver semantic-merge tree-sitter conflict-resolution coding-agents multi-agent mcp-server crdt git entity-level-merge ai-agents linux macos
2 sources
- readme: https://github.com/Ataraxy-Labs/weave · fetched 2026-08-28 · 062753b94979
- homepage: https://ataraxy-labs.github.io/weave/ · fetched 2026-08-29 · 03dbcb3c81b4
Member repositories
| Repository | Role | Health v2 |
|---|---|---|
| Ataraxy-Labs/weave | main | 82 |
For agents
markdown · JSON · MCP: product_card(name="Ataraxy-Labs/weave")
Data as of 2026-08-30T08:39:29.467469+00:00 · Report a problem