[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: postpone push?
From: |
David Kastrup |
Subject: |
Re: postpone push? |
Date: |
Mon, 21 Jul 2014 12:33:23 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) |
Thomas Morley <address@hidden> writes:
> 2014-07-21 11:34 GMT+02:00 David Kastrup <address@hidden>:
>>
>> 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