Am 2020-10-26 20:52, schrieb Bobby de Vos:
There is another initial commit to this branch on 25 May 2014 by Christian Perrier which does not seem to have a parent. Is this the source of my problem?
It seems that Christian Perrier accidently imported the same changes twice to the upstream branch. However, this shouldn't be that much of a problem as long as your local repo is in the same state. You may want to pull the upstream branch first to your local repo as the error message suggests by running e.g. "git branch upstream; git pull origin upstream".
In any case, how to I push all the branches?
If everything else fails you may forcefully push your local repo by calling "git push --force".
- Fabian