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

19 points by hongminhee 7 hours ago on lobsters | 4 comments

op | 5 hours ago

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

tomhukins | 3 hours ago

Previously discussed here and here.

Student | 4 hours ago

It’s good but can be slow

: masklinn | 3 hours ago
And it can create corrupted resolutions, so it can’t be used in a hands off / set-and-forget pipeline.