Re: 2 pushes to dev/staging

[David Kastrup]

"address@hidden" <address@hidden> writes:

> All went well with the rename and I did a git pull -r on the branch to
> boot (which didn't pull anything, as staging has had no new additions
> within the past hour-ish).

Judging from your config file posted previously, your staging branch is
not tracking any upstream branch.

> But then I got this:
>
> address@hidden:~/lilypond-git$ git push origin staging
> To ssh://git.sv.gnu.org/srv/git/lilypond.git
>  ! [rejected]        staging -> staging (non-fast-forward)
> error: failed to push some refs to 'ssh://git.sv.gnu.org/srv/git/lilypond.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
>
> Any ideas?

git branch --set-upstream staging origin/staging

will likely make git pull -r work again.

-- 
David Kastrup