mergiraf
A syntax-aware git merge driver
Mergiraf can solve a wide range of Git merge conflicts. That's because it's aware of the trees in your files! Thanks to its understanding of your language, it can often reconcile the needs of both sides.
GPL-3.0-or-latercloud_download Downloads
To download packages, you need to log in and have a valid subscription.
Please select a product to see the available package versions:
Loading...
Loading package downloads...