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

[David Kastrup]

"Stephen J. Turnbull" <address@hidden> writes:

> 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.

Not if you changed branches recently.  @{1} refers to the reflog of the
current branch, address@hidden or @@{1} are the reflog of the whole
repository, including all branch switches.

> 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.

Nope.

> I'm not sure what happens if HEAD is detached, but that will happen
> regardless of which notation you use.

@{1} will then revert to the global reflog and then all three are
indeed equal.  But not with a branch checked out.

-- 
David Kastrup