From: Elijah Newren <newren@gmail.com>
Date: Wed, 08 Apr 2009 18:07:00 GMT
Subject: Re: need help with git show :1:...
Message-ID: <51419b2c0904081107s7ba08367w671d5b494095402@mail.gmail.com>
In-Reply-To: <7199.1239213762@relay.known.net>

Hi,

On Wed, Apr 8, 2009 at 12:02 PM, layer <layer@known.net> wrote:
> Elijah Newren <newren@gmail.com> wrote:
>>> Does the file have conflicts?  Try
>>> git ls-files -s src/c/sock.c
>
> Yes, it did have conflicts.  I resolved the conflicts via editing, but
> want to look at the other versions before finalizing the edits.
>
> quadra% git ls-files -s src/c/sock.c
> 100644 ef6c9b94c678dc79760edfd15a0796b3726b76f6 0       src/c/sock.c

That suggests that the file is not unmerged, i.e. that there aren't
any remaining conflicts.  This explains why your commands wouldn't
work unless you used stage 0 instead of 1 or 2.  Now, why there
weren't conflicts when you thought there were?  I have no idea, unless
perhaps you did a stray git add src/c/sock.c.

Hope that helps,
Elijah