mergiraf

A syntax-aware Git merge driver for many programming languages and file formats, designed to resolve or reduce conflicts using code structure.

It is developer merge tooling. Use it when projects want smarter merges than line-based conflict handling, while still reviewing results before committing.