{"thread":{"id":"62473","subject":"Mergiraf: a generic syntax-aware merge driver","startedAt":"2024-11-09T11:36:02Z","lastAt":"2024-11-09T11:36:02Z","messageCount":1,"participants":["Antonin Delpeuch"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"506897","messageId":"a79eaccd-f309-4f62-a243-f8fdfd0f0e86@delpeuch.eu","threadId":"62473","inReplyTo":null,"subject":"Mergiraf: a generic syntax-aware merge driver","fromName":"Antonin Delpeuch","fromEmail":"antonin@delpeuch.eu","sentAt":"2024-11-09T11:35:54Z","receivedAt":"2024-11-09T11:36:02Z","isPatch":false,"sender":{"key":"antonin@delpeuch.eu","avatar":"https://avatars.githubusercontent.com/u/309908?v=4"},"body":"Hello all,\n\nI hope it's okay to share this here: I made https://mergiraf.org, a git\nmerge driver which understands the syntax of the files it merges. It's a\nbit like difftastic, but for merging. Language support relies on\ntree-sitter parsers and some more declarative settings on top, to make\nit easy to add support for more languages and formats (only a dozen so far).\n\nNeedless to say, it's just off the press and an early prototype, so it's\nbound to behave inadequately in some cases. I have tried to make it easy\nto review its work to avoid bad merges.\n\nI'd be happy for any feedback and suggestions on it.\n\nCheers,\n\nAntonin\n\n"}]}