Hello all, I hope it's okay to share this here: I made https://mergiraf.org, a git merge driver which understands the syntax of the files it merges. It's a bit like difftastic, but for merging. Language support relies on tree-sitter parsers and some more declarative settings on top, to make it easy to add support for more languages and formats (only a dozen so far). Needless to say, it's just off the press and an early prototype, so it's bound to behave inadequately in some cases. I have tried to make it easy to review its work to avoid bad merges. I'd be happy for any feedback and suggestions on it. Cheers, Antonin
