Cool Link
GitHub - Ataraxy-Labs/weave: 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. · GitHub github.com

github.com/Ataraxy-Labs/weave