02:45
2026-06-14
ataraxy-labs.github.io
developer-tools
Weave: Merging based on language structure and not lines
Weave, a new Git merge driver from Ataraxy Labs, resolves merge conflicts by parsing code structure with tree-sitter and merging at the function or class level instead of by lines. It supports 31 merg…