A syntax-aware git merge driver
https://mergiraf.org/
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.
- Links to devel:tools:scm / mergiraf
- Has a link diff
- Download package
-
Checkout Package
osc -A https://api.opensuse.org checkout home:mnhauke/mergiraf && cd $_ - Create Badge
Refresh
Refresh
Source Files (show merged sources derived from linked package)
| Filename | Size | Changed |
|---|---|---|
| _link | 0000000053 53 Bytes |
Comments 0