On Thu, Jun 11, 2020 at 11:46 AM Miro Hrončok <mhroncok@xxxxxxxxxx> wrote:
On 11. 06. 20 13:41, Richard Shaw wrote:
> remote: *** Your commits contain a bad merge:
> remote: *** 47456e93 2020-06-10 Merge branch 'master' into tmp/mingw***
> Please rebase on top of this commit in tmp/mingw:
> remote: *** a596a086 2020-06-10 Initial commit for MinGW 64bit builds.
This sounds like some hook of their own. They are asking you to rebase your
changes instead of merging.
Yeah, that's what I ended up doing...
Thanks,
Richard
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
