RE: https://fosstodon.org/@robinm/116056737177373004

Need some help with your merge conflicts? Maybe give Mergiraf and Difftastic a try!

#git #mergiraf #difftastic

I just found a relatively new tool for syntax-aware diff/merge operations on git repositories ( #Mergiraf ).

Unlike other tools I've tried in the past, this one is also diff3-friendly  .

- https://mergiraf.org/
- https://lwn.net/Articles/1042355/

For the weirdos like me who prefer `rebase` over `merge` this can be a great mood & productivity booster 

Mergiraf: Syntax-Aware Merging for Git

https://lwn.net/SubscriberLink/1042355/434ad706cc594276/

#HackerNews #Mergiraf #Syntax-Aware #Merging #Git #VersionControl #DevTools #CodeMerge

New #Mergiraf release with many bug fixes.🦒
https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.16.1

I'm excited about the fact that this release wasn't triggered by me (although it shows as such, because of the API token used in the CI), and that the release process is almost fully automated now (including cross-compilation to many platforms inside #Forgejo Actions!)

Formalizing #governance is nice, but if I'm the only one able to do releases, it defeats the purpose…

#Mergiraf 0.11 is out, with support for #Haskell, #OCaml and #Elixir, better #Rust support, and more! 🦒

And we reached 25 contributors! Really happy how this little project is growing 😊

First real-life application of #mergiraf for me today while rebasing a #nixpkgs PR. There was a ridiculous amount of merge conflicts and nothing I did (manual combing through, code formatting before, using the provided nixfmt merger, ...) could bring me forward. mergiraf didn't break a sweat, it just merged without a twitch. 👍 Invaluable tool! ✨

https://mergiraf.org

#git #nixos

#Mergiraf 0.7 is released 🪂 🦒! It includes quite a few bug fixes and UX improvements, so it's worth upgrading :)

https://codeberg.org/mergiraf/mergiraf/releases/tag/v0.7.0
#git #treesitter #codeberg #jujutsu