dist-git: Diverging branches can't be fast-forwarded

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



When I make SPDX statistics I have git checkout of all dist-gits and do git-pull every two week there. This morning I found that two times I got an error:

hint: Diverging branches can't be fast-forwarded, you need to either:
hint:  
hint:   git merge --no-ff
hint:  
hint: or:
hint:  
hint:   git rebase
hint:  
hint: Disable this message with "git config advice.diverging false"
fatal: Not possible to fast-forward, aborting.
Could not execute pull: Failed to execute command.

I was under the impression that our dist-git can have only forward commits.

Is this expected? Or is this sign of something malicious happenening?

Unfortunately I do not have name of these two repos. I can retrieve it, but it will take few hours to run the script.

-- 
Miroslav Suchy, RHCA
Red Hat, Manager, Packit and CPT, #brno, #fedora-buildsys
_______________________________________________
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
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Fedora Announce]     [Fedora Users]     [Fedora Kernel]     [Fedora Testing]     [Fedora Formulas]     [Fedora PHP Devel]     [Kernel Development]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Gimp]     [Yosemite News]

  Powered by Linux