Thomas Morley <[email protected]> writes:

> 2014-07-21 11:34 GMT+02:00 David Kastrup <[email protected]>:
>>
>> You are perfectly fine here.  However, origin/staging is _not_ listed
>> here as a reference: it has indeed moved ahead so that, like I stated,
>> git refuses to push.
>>
>> At the current point of time, it appears to have caught up again.

I mean, master appears to have caught up with staging again.

>> So just do the
>>
>> git fetch
>> git rebase origin/master mybranch
>> git push origin HEAD:staging
>>
>> cycle again.
>
> Works now.

Just looked at it: staging and its history looks fine, and if there are
no problems, master should again catch up eventually.

-- 
David Kastrup

_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to