Antonin DelpeuchMay 15

Strawberries are delicious but let me tell you about the taste of a pull request opened by a dear #mergiraf colleague, making changes to our #governance. First time someone else is making changes to that GOVERNANCE.md, it's so yummy! 

https://codeberg.org/mergiraf/mergiraf/pulls/762

Time to find myself some other life goals I guess! 😅

doc: add a donation option (Liberapay)

Resolves https://codeberg.org/mergiraf/mergiraf/issues/758 This PR changes GOVERNANCE.md, so it requires a vote (as per GOVERNANCE.md)

Codeberg.org
Show threadAntonin DelpeuchApr 18
@benjamingeer you need some level of expertise for sure, but for most tools (such as Neovim) you shouldn't need much knowledge of their internals to maintain queries for them. At least in #mergiraf we try our best to offer a relatively simple interface that people can use with no knowledge of Rust. For tree-sitter parser maintenance itself, it is not rare to stumble on problems that require deeper tree-sitter knowledge, but in general it's relatively shallow I would say.
Mathias HasselmannFeb 12

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

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

#git #mergiraf #difftastic

Show threadAlejandro BaezDec 13, 2025

And going on the same trend, found out about #mergiraf.

I feel like my development workflow is in the future. 😅 It's very small nuances. But these improvements stack on each other. Enough that I don't have to think about the changes as much as before. 😎

https://mergiraf.org/

Introduction - Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Andreu Casablanca 🐀Nov 13, 2025

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 

Introduction - Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Hacker NewsNov 13, 2025

Mergiraf: Syntax-Aware Merging for Git

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

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

Mergiraf: syntax-aware merging for Git

The idea of automatic syntax-aware merging in version-control systems goes back to 2005 or ea [...]

LWN.net
Antonin DelpeuchNov 6, 2025

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.16.1 - mergiraf/mergiraf

### 🚀 Features - *(Git)* Support reading language from git attributes (#599) by @mathstuf - *(rust)* Add `derive` attribute as commutative parent (#614) by @vaw - Use tree-sitter-c to parse `.c` files (#634) by @data-man ### 🐛 Bug Fixes - *(toml)* Invalid signature for keys (#607) by ...

Codeberg.org
Show threadYann Büchau Sep 3, 2025

@cas Have you tried #mergiraf? 🦒 Invaluable tool for such cases.

https://mergiraf.org/

Introduction - Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.

Antonin DelpeuchJun 29, 2025

#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 😊

Yann Büchau May 5, 2025

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

Introduction - Mergiraf

A syntax-aware git merge driver for a growing collection of programming languages and file formats.