merge-engine

A non-LLM merge conflict resolver using structured merge, Version Space Algebra, and search-based techniques


Keywords
conflict, diff3, git, merge, tree-sitter
License
MIT