Agent Switchboard

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.

Use it now

Keep it with up to 9 other tools you're setting up, then share them all as one link.

Try this first

Ask your assistant, with weave connected:

  • Entity-Level Merge

    Use weave to merge code: ‹what you need›

  • Verified Landing

    Use weave to merge a branch: ‹what you need›

  • Conflict Explain and Check

    Use weave to explain each conflicted hunk: ‹what you need›

Connect it over MCP

Ask your coding agent to set it up

Connect weave as an MCP server, following its setup instructions at https://ataraxy-labs.github.io/weave/

Its page: ataraxy-labs.github.io/weave

Install the CLI

Install it as its own instructions say.

Its page: ataraxy-labs.github.io/weave

Compare

Press Compare to add it to the tray at the bottom of the window, then pick up to 2 others anywhere on the site.

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
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.
try this first
Ask your assistant, with weave connected:
Use weave to merge code: ‹what you need›entity-merge
Use weave to merge a branch: ‹what you need›weave-land
Use weave to explain each conflicted hunk: ‹what you need›conflict-explain
use it now
Connect weave as an MCP server, following its setup instructions at https://ataraxy-labs.github.io/weave/mcp.setup-prompt
fields
nameweave
providerAtaraxy Labs
urlhttps://ataraxy-labs.github.io/weave/
categoriescode-devtools
accesscli · mcp
authnone
streamingfalse
pushfalse
verifiedtrue
officialfalse
sponsoredfalse
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…
alternatives
/agents/weave/alternatives8 listedsem, git-ai, maki
compare
/compare?a=weave&b=sem&c=git-aiwith sem, git-ai