Re: git pull fails with merge conflicts. How can this possibly happen?

[David Kastrup <dak@gnu.org>]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Stephen J. Turnbull" <stephen@xemacs.org>
>> Date: Sun, 16 Nov 2014 01:31:23 +0900
>> Cc: emacs-devel@gnu.org
>> 
>> David Kastrup writes:
>> 
>>  > Which seems like a really stupid idea since it means that HEAD@{1}
>>  > is different from @{1} but is the same as @@{1}.
>> 
>> No, they all mean the same thing AFAICT.
>
> That's my conclusion as well, but you won't find that in the docs.
> The description of @{n} explicitly mentions "reflog", but the
> description of REFNAME@{n} only hints on that.

dak@lola:/usr/local/tmp/lilypond$ git checkout issue216
Previous HEAD position was 2a67ab2... Doc: Document unit of \abs-fontsize
Switched to branch 'issue216'
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)
dak@lola:/usr/local/tmp/lilypond$ git reflog -1 @{4}
fatal: Log for 'issue216' only has 4 entries.
dak@lola:/usr/local/tmp/lilypond$ git reflog -1 @@{4}
2a67ab2 HEAD@{4}: checkout: moving from 2a67ab2aee4e826c1998684249ecd2e862e4804c

-- 
David Kastrup