[Top][All Lists]

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

Re: 2 pushes to dev/staging

From: David Kastrup
Subject: Re: 2 pushes to dev/staging
Date: Thu, 24 Nov 2011 10:22:56 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux)

"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://
>  ! [rejected]        staging -> staging (non-fast-forward)
> error: failed to push some refs to 'ssh://'
> 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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]