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

cannot push all of fonts-sil-nuosusil



Greetings,

I have updated the packaging for fonts-sil-nuosusil and tried to push
using git push --all (on an Ubuntu focal machine, with git version 2.25.1)

Some of my changes to the packaging reached Salsa. The upstream branch
did not. the dput commands says

 ! [rejected]        upstream -> upstream (non-fast-forward)
error: failed to push some refs to
'git@salsa.debian.org:fonts-team/fonts-sil-nuosusil.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Is there something wrong with the upstream branch. In the local repo
where I am doing the work the first commit in this branch is on 3 Jun
2007 from Nicolas Spalinger.

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?

In any case, how to I push all the branches?

Thanks, Bobby

-- 
Bobby de Vos
/bobby_devos@sil.org/

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: