|
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 8 comments
@wilfredh it's very similar to #difftastic in spirit so I'm curious what you think of it :) @toastal I would say it's unlikely, because the notion of diff that they use is much more baked into the VCS than in git. So you wouldn't be able to implement it as a plugin - it would need support at the core of the tool, which would make the whole thing very complicated I think. See this discussion about Pijul: https://discourse.pijul.org/t/ast-level-diffs-and-merges/187   |
Gregory's Server
@pintoch this looks super cool, and also omg the illustrations 💖