# Mergiraf: a generic syntax-aware merge driver

1 messages from 2024-11-09 to 2024-11-09. Participants: Antonin Delpeuch.
Thread: https://gitlist.dev/t/62473

## Antonin Delpeuch, 2024-11-09 11:35

Subject: Mergiraf: a generic syntax-aware merge driver
Message-ID: <a79eaccd-f309-4f62-a243-f8fdfd0f0e86@delpeuch.eu>
URL: https://gitlist.dev/e/a79eaccd-f309-4f62-a243-f8fdfd0f0e86%40delpeuch.eu

```
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


```