matsuu
.
@matsuu,
構文を解釈した上で問題のないと判断できるGitのCONFLICTをいい感じに解決してくれるツールかな。
---
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.
https://github.com/Ataraxy-Labs/weave
#bookmarks