GH Repository · 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.
- stars
- 1,286
- 30-day movement
- +72/day
- Related entries
- 61
- Connections
- 2
ai-agentsdeveloper-toolsrustconflict-resolutionskill-packnixnodemcpmerge-drivertree-sittercode-intelligenceRustllm-toolscoding-agentsgit-merge
Weave is a git merge driver that merges at the entity level rather than the line level, using tree-sitter-based code intelligence. It targets false conflicts that arise when independent agents edit the same file, with a claimed ~95% reduction versus line-based merging.
Reach for it when multiple coding agents work in the same repository and git's line-based merge flags conflicts that are not real conflicts.
Use it to
- Configure it as a custom git merge driver
- Reduce spurious conflicts from concurrent agent edits
- Merge structurally aware changes in Rust or Node projects
- Integrate with agent toolchains via MCP
For Developers running multiple coding agents on shared codebases
- Role
- skill-pack
- Language
- Rust
- Licence
- Apache-2.0
- Forks
- 43
- Open issues
- 1
- Last push
- 2026-09-13
- Latest release
- v0.1.0 · 2026-02-08
- Skills shipped
- 1
topicsgit-mergemerge-driverconflict-resolutioncoding-agentstree-sittercode-intelligence