Weave – A language aware merge algorithm based on entities
Summary
Weave presents an entity-level semantic merge tool that replaces Git's line-based merging by parsing base, ours, and theirs into semantic entities and merging at the entity level. The article outlines the problem with line-based merges, explains how Weave works using tree-sitter, provides real-world benchmarks and supported languages, and shows setup and usage in a Git workflow. It positions Weave as a practical automation for reducing human-driven conflicts in multi-agent coding environments and CI/CD pipelines.