* Git error on master?
@ 2014-11-29 9:28 Jan D.
2014-11-29 9:38 ` Jan D.
0 siblings, 1 reply; 4+ messages in thread
From: Jan D. @ 2014-11-29 9:28 UTC (permalink / raw)
To: emacs-devel@gnu.org Development
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git error on master?
2014-11-29 9:28 Git error on master? Jan D.
@ 2014-11-29 9:38 ` Jan D.
2014-11-29 15:36 ` Rostislav Svoboda
0 siblings, 1 reply; 4+ messages in thread
From: Jan D. @ 2014-11-29 9:38 UTC (permalink / raw)
To: emacs-devel@gnu.org Development
Hi.
Another pull apparently fixed it.
Jan D.
> 29 nov 2014 kl. 10:28 skrev Jan D. <jan.h.d@swipnet.se>:
>
> 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.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git error on master?
2014-11-29 9:38 ` Jan D.
@ 2014-11-29 15:36 ` Rostislav Svoboda
2014-11-30 0:25 ` Jan D.
0 siblings, 1 reply; 4+ messages in thread
From: Rostislav Svoboda @ 2014-11-29 15:36 UTC (permalink / raw)
To: Jan D.; +Cc: emacs-devel@gnu.org Development
http://stackoverflow.com/a/7348934
On 29 November 2014 at 10:38, Jan D. <jan.h.d@swipnet.se> wrote:
> Hi.
>
> Another pull apparently fixed it.
>
> Jan D.
>
>> 29 nov 2014 kl. 10:28 skrev Jan D. <jan.h.d@swipnet.se>:
>>
>> 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.
>>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git error on master?
2014-11-29 15:36 ` Rostislav Svoboda
@ 2014-11-30 0:25 ` Jan D.
0 siblings, 0 replies; 4+ messages in thread
From: Jan D. @ 2014-11-30 0:25 UTC (permalink / raw)
To: Rostislav Svoboda; +Cc: emacs-devel@gnu.org Development
Thanks for the pointer.
Jan D.
> 29 nov 2014 kl. 16:36 skrev Rostislav Svoboda <rostislav.svoboda@gmail.com>:
>
> http://stackoverflow.com/a/7348934
>
>> On 29 November 2014 at 10:38, Jan D. <jan.h.d@swipnet.se> wrote:
>> Hi.
>>
>> Another pull apparently fixed it.
>>
>> Jan D.
>>
>>> 29 nov 2014 kl. 10:28 skrev Jan D. <jan.h.d@swipnet.se>:
>>>
>>> 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.
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-30 0:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-29 9:28 Git error on master? Jan D.
2014-11-29 9:38 ` Jan D.
2014-11-29 15:36 ` Rostislav Svoboda
2014-11-30 0:25 ` Jan D.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).