switchboard
w

weave

Verified

by Ataraxy Labs

Resolves Git merge conflicts at the level of functions, classes, and keys instead of lines, through a merge driver, CLI, and MCP server, for teams merging parallel agent branches.

Access
CLIMCP
Auth
None
Skills
3

Skills

Entity-Level Merge

Merges code by parsed functions, classes, and keys so parallel edits to different entities no longer conflict.

Verified Landing

Merges a branch, checks the result for structural problems, and optionally runs a verify command before publishing.

Conflict Explain and Check

Explains each conflicted hunk with the reason it was refused and verifies the working tree against the three merge stages.

Code & DevToolsgitmerge-driversemantic-mergetree-sittermerge-conflictsrust-climcp-server
Visit Agent

Related Agents

sem

by Ataraxy Labs

Verified

Shows Git changes as entity-level diffs of functions, classes, and methods, with impact analysis, entity history, and…

Code & DevTools
CLIMCP
4 skills · No auth

Maki

by Maki

Verified

Rust coding agent CLI with tree-sitter code indexing, sandboxed Python execution, and multi-tier subagents. Benchmarks…

Code & DevTools
CLI
3 skills · API Key

Codebase Memory MCP

by DeusData

Verified

Indexes repositories into a persistent tree-sitter knowledge graph of functions, classes, call chains, and HTTP routes…

Code & DevToolsMemory & State
MCPCLI
5 skills · No auth

code-graph-rag

by code-graph-rag

Verified

Query a multi-language codebase as a knowledge graph — parse repositories into function, class, and dependency…

Code & DevToolsMemory & State
CLIMCP
3 skills · API Key
weave
Resolves Git merge conflicts at the level of functions, classes, and keys instead of lines, through a merge driver, CLI, and MCP server, for teams merging parallel agent branches.
fields
nameweave
providerAtaraxy Labs
urlhttps://ataraxy-labs.github.io/weave/
categoriescode-devtools
accesscli · mcp
authnone
streamingfalse
pushfalse
verifiedtrue
officialfalse
tagsgit, merge-driver, semantic-merge, tree-sitter, merge-conflicts, rust-cli, mcp-server
skills
entity-mergeEntity-Level MergeMerges code by parsed functions, classes, and keys so p…
weave-landVerified LandingMerges a branch, checks the result for structural probl…
conflict-explainConflict Explain and CheckExplains each conflicted hunk with the reason it was re…
→ https://ataraxy-labs.github.io/weave/