Mergiraf

Antonin Delpeuch·Mergiraf.Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Mergiraf can solve a wide range of Git merge conflicts. That's because it's aware of the trees in your files! Thanks to its understanding of your language, it can often reconcile the needs of both sides. You can teach Mergiraf a new language in a completely declarative way. It's a nonviolent animal, so it prefers that over imperatives.