Ataraxy-Labs/weave

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

188 best points · 113 comments · 2 Hacker News posts · 1,351 GitHub stars · View on GitHub

Hacker News discussions

• Weave – A language aware merge algorithm based on entities (188 points, 113 comments, by rs545837, 2026-03-04)
• Weave, an entity-level semantic merge driver for Git (2 points, 0 comments, by pbowyer, 2026-02-11)