Mergiraf is a syntax-aware merge driver that helps reconcile changes made to the same source file by different branches. Ordinary line-based merging can report conflicts even when edits affect independent parts of a structured declaration; Mergiraf attempts to interpret the file structure before deciding whether changes conflict.
It integrates with Git merge operations and can also be run against an existing conflicted file. Its output is intended to reduce the amount of manual work needed during merges, rebases and cherry-picks, while falling back to traditional merging when structural analysis cannot safely handle a file.
Syntax-aware merging is particularly helpful when two branches add independent declarations or reorder elements that a language treats as unordered. It cannot eliminate every real conflict: competing edits to the same construct still require human judgement. Its fallback behaviour keeps it compatible with normal Git workflows.
This is free and open source software.
Key Features
- Uses syntax-tree information to combine changes to supported programming languages and structured files.
- Can merge independent additions and deletions inside language constructs where ordering is not significant.
- Integrates as a Git merge driver and participates in ordinary merge, rebase and cherry-pick workflows.
- Provides a command for attempting resolution of an already conflicted working-tree file.
- Can show a review of its proposed structural merge alongside a conventional line-based result.
- Falls back to line-based merging for unsupported formats or unsuitable parse results.
- Supports embedded-language handling for relevant structured documents, including Markdown content.
- Allows language selection and configuration of parsing-error handling when automatic detection needs adjustment.
- Provides diagnostic reporting for reproducing unexpected merge results.
- Can be extended to additional formats through declarative language definitions.
Website: codeberg.org/mergiraf/mergiraf
Support:
Developer: mergiraf contributors
License: GNU General Public License v3.0

mergiraf is written in Rust. Learn Rust with our recommended free books and free tutorials.
Related Software
| Git Tools for Diff Review and Repository History | |
|---|---|
| difftastic | Structural diff tool that compares files based on their syntax |
| git-filter-repo | Quickly rewrite git repository history |
| onefetch | Displays information about a local Git repository |
| git-stats | Local git statistics including GitHub-like contributions calendars |
| diff-so-fancy | Attractive diffs with diff-highlight and more |
| BFG Repo-Cleaner | Clean unwanted data from Git repository history |
| git-delta | Viewer for git and diff output |
| gitlogue | Cinematic Git commit replay tool |
| git-quick-stats | Access various statistics in a git repository |
| git-who | Command-line Git analysis tool |
| git-standup | Recall what you did on the last working day |
| git-of-theseus | Analyze how a Git repo grows over time |
| git-sizer | Compute various size metrics for a git repository |
| diffnav | Git diff pager based on delta but with a file tree, à la GitHub |
| critique | Terminal UI for reviewing git diffs |
| git-big-picture | Visualization tool for Git repositories |
| hercules | Gain advanced insights from Git repository history |
| keifu | TUI that visualizes Git commit graphs |
| git-fame | Git repository collaborators sorted by contributions |
| needle | Highlights GitHub PRs |
| mergiraf | Git merge driver |
| git-history | Analyze Git history using SQLite |
| ec | Terminal Git mergetool |
| diffr | Word-by-word diff highlighting utility |
| git-scope | Fast TUI dashboard to view the git status of all your repositories |
| mamediff | Manages unstaged and staged Git diffs |
| deadbranch | Keep Git repositories tidy |
| GitTop | Lightweight desktop client for GitHub notifications |
| git-heatmap | Generates a customizable heatmap |
Read our verdict in the software roundup.
LinuxLinks helps you discover the best free and open source software for Linux. Explore our extensive collection of recommended applications, including alternatives to popular proprietary software.We also publish software reviews, Linux tutorials, hardware reviews, free programming books and articles covering the wider open source community. Browse our Linux resources to discover more. Know a useful free and open source Linux application we haven't covered? Suggest a program for inclusion. Has your software been featured on LinuxLinks? Display one of our Featured on LinuxLinks badges on your website or GitHub README. |


Please read our Comment Policy before commenting.