On Wed, 28 Jan 2009, David Berry wrote:
> 2009/1/28 Tim Jenness <[log in to unmask]>:
>> On Wed, 28 Jan 2009, David Berry wrote:
>>
>>> Did the same with ast.news, but "git push" said:
>>>
>>> To ssh:[log in to unmask]
>>> ! [rejected] master -> master (non-fast forward)
>>> error: failed to push some refs to
>>> 'ssh:[log in to unmask]
>>>
>>
>> Have you done a 'git pull'. That error looks like it's saying you aren't up
>> to date at your end.
>
> Ah - is *that* what it's saying! Indeed after doing a "git pull" I can
> now do a "git push".
>
It thinks a merge is required (non-fast forward means that it can't simply
move the position of HEAD which is what can be done locally if you develop
on a branch but have made no commits to master) because there are commits
missing from both ends.
--
Tim Jenness
JAC software
http://www.jach.hawaii.edu/~timj
|