Weave – A language aware merge algorithm based on entities
Weave is an entity-level semantic merge driver for Git that resolves conflicts by understanding code structure using tree-sitter. It achieves 31 out of 31 clean merges, compared to Git's 15 out of 31.
