Vibe Coding Discoverweave
View on GitHubEntity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.
A Rust Git merge driver that parses code into entities such as functions, classes, and keys, then performs three-way semantic merges. It can resolve independent edits that line-based Git reports as conflicts and provides an MCP server for agent integration.
Use Cases
Automatically merge independent edits from multiple coding agentsReduce false Git conflicts when separate functions in one file changeExplain and validate unresolved semantic merge conflictsExpose merge operations to agents through an MCP server
Built With
- Language
- Rust
- Frameworks
- tree-sitter
Tags
coding-agents · git-merge · semantic-merge · conflict-resolution · developer-tools · MCP · tree-sitter