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
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
On 11/06/2015 02:01 PM, Germano Massullo wrote:
1) I edited the file once to remove 32 bit CPU support
Why are you trying to remove 32 bit support in the first place?
--
Kalev
--
devel mailing list
devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/devel
Fedora
Hi,
On Fri, 2015-11-06 at 14:01 +0100, Germano Massullo wrote:
> 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
