Weave

What is Weave?

Weave is an entity-level git merge driver that replaces standard line-based merging. It parses code into functions, classes, and keys using tree-sitter, then merges those entities instead of individual lines. This approach allows it to distinguish between truly conflicting changes and overlapping edits in different parts of the same file.

The tool significantly reduces false conflicts, claiming approximately a 95 percent reduction compared to traditional git behavior. It integrates directly with existing git workflows like merge, rebase, and cherry-pick without requiring changes to how branches are handled. When real conflicts occur, they are marked with clear indicators and can be resolved using built-in verification commands.

Weave includes a command-line interface and an MCP server for integration with coding agents. It provides commands to set up the repository, explain conflict details, verify the working tree, and land merged changes. The project is part of a broader developer infrastructure stack focused on agent-native software development.

Weave features

• Parses code into functions, classes, and keys using tree-sitter
• Performs entity-level three-way merges instead of line-based comparisons
• Integrates with standard git merge, rebase, and cherry-pick commands
• Provides CLI tools to explain conflicts, verify trees, and land changes
• Includes an MCP server for integration with AI coding agents
• Marks unresolved conflicts with clear refusal markers and explanations

Who uses Weave and for what

• Multiple AI coding agents editing the same file simultaneously
• Teams managing large codebases with frequent parallel feature additions
• Automated CI pipelines that apply patches from independent branches
• Developers rebasing feature branches onto updated main branches
• Projects migrating from manual conflict resolution to automated workflows

Weave FAQ

Comments (0)

Comments and upvotes open when this product launches on ProductPerch.