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

[Stephen J. Turnbull]

David Kastrup writes:

 > Which seems like a really stupid idea since it means that address@hidden
 > is different from @{1} but is the same as @@{1}.

No, they all mean the same thing AFAICT.  The first and third are
obviously the same.  The second is defined as meaning <current>@{1},
but I believe that <current> is implemented by dereffing HEAD.  I'm
not sure what happens if HEAD is detached, but that will happen
regardless of which notation you use.