Weave Brings Semantic Merging to Git

Ataraxy Labs released weave, a Git merge driver that parses code into functions, classes and keys with tree-sitter, then merges those entities instead of lines. Benchmarked on 4,971 file merges across five open-source repos, it resolved 344 conflicts Git could not, with 86 regressions. It supports 40-plus languages and ships an MCP server for coding agents.