Mergiraf
Hacker ApprovedShares rank 3 of 13 diff tools by recommenders
Syntax-aware Git merge driver that automatically resolves many conflicts and saves rebase time; it fails when both sides insert at the same tree position.
Syntax-aware Git merge driver that automatically resolves many conflicts and saves rebase time; it fails when both sides insert at the same tree position.
23 people gave an opinion
- recommend it
- 19
- criticize it
- 4
- approval share
- 83%
Recommended in 5 of 13 months
- November 2025: recommended
- December 2025: recommended
- January 2026: not recommended
- February 2026: not recommended
- March 2026: recommended
- April 2026: not recommended
- May 2026: not recommended
- June 2026: recommended
- July 2026: recommended
- August 2026: not recommended
- September 2026: not recommended
- October 2026: not recommended
- November 2026: not recommended (month in progress)
Owned for 6 months
Median of the 3 owners who said how long they have had it.
Each square is one year.
Why it carries the badge
- 19 people recommend itNeeds 10 or more, met.
- 4.8 recommenders for every criticNeeds 2 to 1 or better, met.
- Recommended in 5 of 13 monthsNeeds 4 or more, met.
The same three rules apply to every product, and the badge can’t be bought. How the badge works
What people say about it
The reasons people give, with the number of comments that give each one. Open a reason to read what they said.
Why people recommend it
Each mark is one comment
Resolves most conflicts automatically
“I've resolved hundreds of conflicted merges this way and I don't remember it making a single mistake.”
Comment from 13 Nov 2025 in “Mergiraf: Syntax-Aware Merging for Git” “It's automatically solved about 70% of my conflicts and, luckily, I've never contested any of them.”
Comment from 13 Nov 2025 in “Mergiraf: Syntax-Aware Merging for Git” “has a pretty good success rate for my work”
Comment from 23 Mar 2026 in “A Coherent Vision for the Future of Version Control” Saves time on rebases
“Guys, there's a tool called mergiraf that does wonders. I don't remember my last rebase”
Comment from 23 Mar 2026 in “A Coherent Vision for the Future of Version Control” “I find Mergiraf pretty pleasant to use and frequently pretty helpful as a time-saver.”
Comment from 9 Mar 2026 in “Beagle, a source code management system that stores AST trees” “could save a lot of time and pain in big projects”
Comment from 13 Nov 2025 in “Mergiraf: Syntax-Aware Merging for Git” Works with jj and tree-sitter
“just `jj resolve --tool mergiraf` and some conflicts go away”
Comment from 13 Nov 2025 in “Mergiraf: Syntax-Aware Merging for Git” “for tree-sitter-based conflict resolution”
Comment from 14 Jul 2026 in “The Git history command deserves more attention” “uses mergiraf as the resolution driver”
Comment from 14 Jun 2026 in “Weave: Merging based on language structure and not lines” - Comment from 4 Dec 2025 in “Programming peaked”
Syntax-aware merging preferred over line-based
“That's why mergiraf gives you much better performance without any errors.”
Comment from 13 Nov 2025 in “Mergiraf: Syntax-Aware Merging for Git” “I also thought that a semantic merge is the best solution”
Comment from 23 Mar 2026 in “A Coherent Vision for the Future of Version Control”
What people warn about
Each mark is one comment
Fails when both sides insert at same position
“Mergiraf works at tree-node level, so when both sides insert at the same tree position it can't distinguish them.”
Comment from 11 Feb 2026 on Hacker News “The 5 scenarios where mergiraf fails are both-add-at-same-position and decorator conflicts.”
Comment from 16 Feb 2026 on Hacker News
Other diff tools people recommend
The four most recommended other diff tools, with the same counts for each, so you can compare like for like. The tick on each bar marks the 2 to 1 line the badge needs.
| Product | Recommend | Criticize | Approval | Months | Owned | Badge |
|---|---|---|---|---|---|---|
| difftastic | 23 | 1 | 96% | 10 | — | Approved |
| Weave merge tool | 20 | 11 | 65% | 6 | — | — |
| MergirafThis page | 19 | 4 | 83% | 5 | 6 mo3 owners | Approved |
| sem | 19 | 7 | 73% | 5 | — | Approved |
| Meld | 12 | 2 | 86% | 5 | — | Approved |
What people said
27 of the 28 comments that mention it, newest first. Each links to the original comment.
“The documentation is truly a thing of beauty.”
“I absolutely love the images on the landing page.”
“for tree-sitter-based conflict resolution”
“an example for the merge stuff I couldn't find while typing before”
“uses mergiraf as the resolution driver”
“has a pretty good success rate for my work”
“I also thought that a semantic merge is the best solution”
“the one I am enthusiastic about today is Mergiraf”
“Guys, there's a tool called mergiraf that does wonders. I don't remember my last rebase”
“I find Mergiraf pretty pleasant to use and frequently pretty helpful as a time-saver.”
“I've had good experience with it so far, although I rarely even need it.”
“instead of a tree of node triples”
“Sadly neither support bash out of the box”
“The 5 scenarios where mergiraf fails are both-add-at-same-position and decorator conflicts.”
“Mergiraf works at tree-node level, so when both sides insert at the same tree position it can't distinguish them.”
“conflict resolution with mergiraf”
“Don't use it in when you write code for critical infrastructure or aviation please.”
“ended up with so many weird problems that I eventually tracked down to being caused by it”
“I've resolved hundreds of conflicted merges this way and I don't remember it making a single mistake.”
“That's why mergiraf gives you much better performance without any errors.”
“I think C might be a pretty weak language for this tool because you can't really parse it without running the whole preprocessor”
“6,987 still resulted in conflicts, but 428 were resolved successfully.”
“Not a gamechanger, but definitely on the positive side.”
“It's automatically solved about 70% of my conflicts and, luckily, I've never contested any of them.”
“just `jj resolve --tool mergiraf` and some conflicts go away”
“could save a lot of time and pain in big projects”
“can significantly simplify developers' lives”
Counts come from 1,795,640 Hacker News comments, November 2025 to November 2026. How we count. Report a mistake.