New blog post: mergiraf.org, a syntax-aware merge driver for #Git.

Supports #Java, #Rust, #Golang, #javascript, #cpp, #csharp, #html, #json, #yaml and #xml so far, and it's quite easy to add support for more thanks to #treesitter.

antonin.delpeuch.eu/posts/merg…

Get it on #Codeberg: codeberg.org/mergiraf/mergiraf

mergiraf

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

^Codeberg.org