I have done some mistakes in [1] 1) I edited the file once to remove 32 bit CPU support, then I have done the push to master 2) I saw that I have forgotten to add changelog, so I edited the file again, I made a new push to master 3) I started merging the F21 branch to the master and I got the conflict I have found a solution like [2], but I am afraid of making things get worse... Thank you for your time [1]: http://pkgs.fedoraproject.org/cgit/darktable.git/tree/darktable.spec [2]: http://stackoverflow.com/questions/881092/how-to-merge-a-specific-commit-in-git -- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
