Mergiraf – syntax-aware git merge driver
Are you held back by conflicts? Then meet Mergiraf 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. Demo Configure Git to use Mergiraf instead of its default merge heuristics. This will enhance git merge, revert, rebase, cherry-pick and more. You can also keep Git’s original behaviour and manually invoke Mergiraf after encountering conflicts. Figure 1: Two git users making inadequate use of blame, push and pull to resolve a conflict Ready to give it a try? Head to the installation page and start…
