git-merge

Weave is a Git extension that performs entity-level semantic merging to resolve conflicts by parsing code into functions, classes, and keys using tree-sitter, especially useful for AI-driven development.

The author describes an experiment where merging two AI agents' git worktrees led to test failures despite clean merges, highlighting the challenges of parallel agent development without mutual awareness.