Conversation

Notices

1. Aral Balkan (aral@mastodon.ar.al)'s status on Friday, 15-Nov-2024 16:49:34 JST Aral Balkan

   in reply to

   • Antonin Delpeuch

   @pintoch Sounds neat, thanks for sharing :)

   • Antonin Delpeuch (pintoch@mamot.fr)'s status on Friday, 15-Nov-2024 16:49:41 JST Antonin Delpeuch

     New blog post: https://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.

     https://antonin.delpeuch.eu/posts/mergiraf-a-syntax-aware-merge-driver-for-git/

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