Weave adds AST-aware merges to Git, eliminating false conflicts
Weave replaces Git’s line-based merge driver with a tree-sitter powered, entity-level approach. It detects and merges edits to different functions or classes without conflicts, letting multiple agents work on the same file safely. Supports seven languages and integrates with AI agents via Model Context Protocol.