Mergiraf
No written verdict yet. Here is what commenters said.
8recommend
1warn against
Nov 12, 2025first mention
Jul 13, 2026latest mention
Why people recommend it
“Don't forget mergiraf, for tree-sitter-based conflict resolution”
“an example for the merge stuff I couldn't find while typing before”
Show 3 more
“recently added a mergiraf integration”
“There are a number of projects to improve this like Mergiraf”
“the one I am enthusiastic about today is Mergiraf: https://codeberg.org/mergiraf/mergiraf”
Caveats and dissent
“Sadly neither support bash out of the box, which makes me suspect that classic merge is better in this/some cases”
Often compared with
Threads where it came up
- Weave: Merging based on language structure and not lines 3 mentions
- Weave – A language aware merge algorithm based on entities 3 mentions
- A Coherent Vision for the Future of Version Control 2 mentions
- The Git history command deserves more attention 1 mention
- Epic Games announces Lore version control system 1 mention
- We've raised $17M to build what comes after Git 1 mention
Also written as mergiraf. Data: mergiraf.json. Quotes are verbatim; the verdict and theme labels are written by a model from these comments, and every clause links to its sources.
All comments 13
“Don't forget mergiraf, for tree-sitter-based conflict resolution”
“an example for the merge stuff I couldn't find while typing before”
“recently added a mergiraf integration”
There's a benchmark on the site that compares with mergiraf. https://ataraxy-labs.github.io/weave/benchmarks.html
“it sounds similar to Mergiraf”
“There are a number of projects to improve this like Mergiraf”
“the one I am enthusiastic about today is Mergiraf: https://codeberg.org/mergiraf/mergiraf”
Guys, there’s a tool called mergiraf[1] that does wonders. I don’t remember my last rebase [1]: https://mergiraf.org/
“I find Mergiraf pretty pleasant to use and frequently pretty helpful as a time-saver.”
“mergiraf is already supported for windows”
“I've had good experience with it so far”
“Sadly neither support bash out of the box, which makes me suspect that classic merge is better in this/some cases”
“This is a very interesting idea that could save a lot of time and pain in big projects.”