weave
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.
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.
Related Agents
AgentOps for Apify Builders Bundle
Apify actor bundle for agent builders: normalize run traces for QA, control costs, and guard tool calls with a firewall…
OpenSandbox
Runs AI-agent workloads in isolated Docker or Kubernetes sandboxes, exposing sandbox lifecycle, command, filesystem, an…
sem
Shows Git changes as entity-level diffs of functions, classes, and methods, with impact analysis, entity history, and a…
Argent
Gives AI coding assistants control of iOS simulators, Android emulators, TVs, and Electron apps to tap, debug, profile,…