Get the latest tech news
Mergiraf: a syntax-aware merge driver for Git
A syntax-aware git merge driver for a growing collection of programming languages and file formats.
Figure 1: Two git users making inadequate use of blame, push and pull to resolve a conflict Mergiraf does its best to err on the side of caution and retain conflict markers in the file when encountering suspicious cases. The operation of merging diverging versions of files happens routinely when working on a code base, often without you noticing as long as there aren't any conflicts.
Or read this on Hacker News