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.
Why this job: works in the areas we cover, but does not say which job it does

What it does
Resolves merge conflicts that Git can't by parsing code into functions, classes, and keys with tree-sitter, then merging those entities instead of lines.
Get started
brew install weave- Maintenance
- Active
- Last commit 5 days ago
- Stars
- 1,356
- +5 this week
- Licence
- Apache-2.0
- Allows business use
- Downloads for
- 3 systems
- Mac, Windows, Linux
- Latest version
- v0.7.1
- Released 10 days ago
- Built with
- Rust
- 99% of the code
Is it looked after?
- Contributors
- 5
- Last 90 days
- Issues
- 100% closed
- 0 still open
- Pull requests
- 126 merged
- 3 waiting
- Releases
- 36
- 30+ in the last year
- No contributing guide
- No security policy
- No code of conduct
Similar repos
| Repo | Stars | Last commit | Licence | Downloads for |
|---|---|---|---|---|
| devlint / GitWand | 196 | today | MIT | Mac, Windows, Linux |
More: download files, languages, topics and project record
Download files, v0.7.1
- Mac6 files, 75 downloads
- Windows6 files, 63 downloads
- Linux6 files, 191 downloads
Languages
- Rust 99%
- JavaScript <1%
- Python <1%
- Nix <1%
Topics
- ai-agents
- conflict-resolution
- developer-tools
- mcp
- merge-driver
- tree-sitter
- code-intelligence
- coding-agents
- git-merge
- llm-tools
Project record
- JobOther AI tools
- StatusListed
- Commits374
- Forks49
- Watching4
- Stars in 28 days+33
- CreatedFeb 6, 2026
- First seen by usNov 7, 2026
- CheckedNov 12, 2026
