Install latest/beta of mergiraf
Ubuntu 16.04 or later?
Make sure snap support is enabled in your Desktop store.
Install using the command line
sudo snap install mergiraf --beta
Don't have snapd? Get set up for snaps.
Mergiraf can solve [a wide range of Git merge conflicts](https://mergiraf.org/conflicts.html). That's because it's aware of the trees in your files!
Thanks to [its understanding of your language](https://mergiraf.org/languages.html), it can often reconcile the needs of both sides.
You can [teach Mergiraf a new language](https://mergiraf.org/adding-a-language.html) in a completely declarative way. It's a nonviolent animal, so it prefers that over imperatives.
Thank you for your report. Information you provided will help us investigate further.
There was an error while sending your report. Please try again later.
You are about to open
Do you wish to proceed?
Generate an embeddable card to be shared on external websites.
Choose your Linux distribution to get detailed installation instructions. If yours is not shown, get more details on the installing snapd documentation.