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

19 points by hongminhee

op

https://mergiraf.org/ includes more information.

tomhukins

Previously discussed here and here.

Student

It’s good but can be slow

masklinn

And it can create corrupted resolutions, so it can’t be used in a hands off / set-and-forget pipeline.