Thank you, I was trying to solve with [1] but your > $ git checkout master -- darktable.spec # solve the conflict by taking the > file as it is in master is the key of success :-)
[1]: https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ -- devel mailing list devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
