Get the latest tech news
Weave – A language aware merge algorithm based on entities
Entity-level semantic merge driver for Git. Resolves conflicts that git can't by understanding code structure via tree-sitter. 31/31 clean merges vs git's 15/31. - Ataraxy-Labs/weave
None
Or read this on Hacker News