mergiraf

mergiraf

Alex Murray (alexmurray) Publisher Star developer Star developer

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 is only available on the unstable beta channel. It could break and change often.

Channel Version Published

A syntax-aware git merge driver

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.

Details for mergiraf

License
  • GPL-3.0

Last updated
  • 16 December 2024 - latest/beta
  • 8 December 2024 - latest/edge

Websites

Source code

Report a bug

Report a Snap Store violation

Share this snap

Generate an embeddable card to be shared on external websites.


Install mergiraf on your Linux distribution

Choose your Linux distribution to get detailed installation instructions. If yours is not shown, get more details on the installing snapd documentation.