From: "Jan D." <jan.h.d@swipnet.se>
To: Rostislav Svoboda <rostislav.svoboda@gmail.com>
Cc: "emacs-devel@gnu.org Development" <emacs-devel@gnu.org>
Subject: Re: Git error on master?
Date: Sun, 30 Nov 2014 01:25:10 +0100 [thread overview]
Message-ID: <E8AD1C38-AEC2-42C6-BC45-A8F0DF2A573F@swipnet.se> (raw)
In-Reply-To: <CAEtmmezRmK9wRgoaAra1tkMgXVYZbcqZiDCncVW1qRNt32HFCQ@mail.gmail.com>
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.
>>
>>
prev parent reply other threads:[~2014-11-30 0:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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. [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E8AD1C38-AEC2-42C6-BC45-A8F0DF2A573F@swipnet.se \
--to=jan.h.d@swipnet.se \
--cc=emacs-devel@gnu.org \
--cc=rostislav.svoboda@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).