Re: patches to apply

[Carl Sorensen]

On 11/1/11 4:30 PM, "Peekay Ex" <address@hidden> wrote:

>David,
>
>On Tue, Nov 1, 2011 at 3:55 PM, David Kastrup <address@hidden> wrote:
>> Peekay Ex <address@hidden> writes:
>>
>>> On Tue, Nov 1, 2011 at 2:10 PM, David Kastrup <address@hidden> wrote:
>>>> Peekay Ex <address@hidden> writes:
>>>>
>>>>> Yes and I suppose that is why I cannot push these patches to
>>>>>dev\staging
>>>>>
>>>>> --snip--
>>>>>
>>>>> address@hidden:~/lilypond-git$ git push origin
>>>>> HEAD:refs/heads/dev/staging
>>>>> To ssh://address@hidden/srv/git/lilypond.git
>>>>>  ! [rejected]        HEAD -> dev/staging (non-fast-forward)
>>>>> error: failed to push some refs to
>>>>> 'ssh://address@hidden/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.
>>>>> --snip--
>>>>>
>>>>> Is there something I can do on my side to push these to dev\staging?
>>>>
>>>> For single patches, this is reasonably simple.  First do
>>>>
>>>> git rebase origin/dev/staging
>>>
>>> I got an error:
>>>
>>> address@hidden:~/lilypond-git$ git rebase origin/dev/staging
>>> fatal: Needed a single revision
>>> invalid upstream origin/dev/staging
>>
>> Well, use whatever your tracking branch is called.  What does
>> git branch -r
>> say?
>
>address@hidden:~/lilypond-git$ git branch -r
>  origin/HEAD -> origin/master
>  origin/master


I would do:

git checkout dev/staging
git push origin dev/staging

In order to get my changes into dev/staging on origin.

HTH,

Carl
>