mergiraf

Mergiraf can solve [a wide range of Git merge conflicts](https://mergiraf.org/conflicts.html). That's because it's aware of the trees in your files!

Thanks to [its understanding of your language](https://mergiraf.org/languages.html), it can often reconcile the needs of both sides.

You can [teach Mergiraf a new language](https://mergiraf.org/adding-a-language.html) in a completely declarative way. It's a nonviolent animal, so it prefers that over imperatives.