Ataraxy Labs Releases Weave, a Smarter Git Merge Tool

Ataraxy Labs released Weave, a Git merge driver that resolves conflicts by understanding code structure—functions, classes, methods—rather than counting lines. Built in Rust and using tree-sitter parsing, it eliminates false conflicts when multiple developers edit the same file logically separately. The tool slots directly into Git's workflow via .gitattributes. Language support depends on tree-sitter grammar maturity.