Re: Git error on master?

[Jan D.]

Thanks for the pointer. 

      Jan D. 



> 29 nov 2014 kl. 16:36 skrev Rostislav Svoboda <address@hidden>:
> 
> http://stackoverflow.com/a/7348934
> 
>> On 29 November 2014 at 10:38, Jan D. <address@hidden> wrote:
>> Hi.
>> 
>> Another pull apparently fixed it.
>> 
>>        Jan D.
>> 
>>> 29 nov 2014 kl. 10:28 skrev Jan D. <address@hidden>:
>>> 
>>> Hello.
>>> 
>>> Does anyone know how to resolve this?  What happened?
>>> 
>>> error: Ref refs/remotes/origin/master is at 
>>> dbff8fd118824163f4d2780fa8566cf92e1d8e86 but expected 
>>> f054f0f265a09adde84c9f543d0a2f810cdafe8e
>>> From git.sv.gnu.org:/srv/git/emacs
>>> ! f054f0f..dbff8fd  master     -> origin/master  (unable to update local 
>>> ref)
>>> * [new branch]      dynamic-modules -> origin/dynamic-modules
>>> error: Ref refs/remotes/origin/emacs-24 is at 
>>> 6b765b8facbdbb03f28028007885236601652515 but expected 
>>> d9ad26a6df4110d32454496d2d864fb9a15d6d00
>>> ! d9ad26a..6b765b8  emacs-24   -> origin/emacs-24  (unable to update local 
>>> ref)
>>> 
>>> Thanks,
>>> 
>>>      Jan D.
>> 
>>