git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: need help with git show :1:...

From
Elijah Newren <newren@gmail.com>
Date
Apr 8, 2009, 18:07 UTC
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:
Show 9 quoted lines
> 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

Previous: layerNext: layer
Message 4 of 8 in “need help with git show :1:...”
  1. layerApr 8, 2009
  2. Elijah NewrenApr 8, 2009
  3. layerApr 8, 2009
  4. Elijah NewrenApr 8, 2009
  5. layerApr 8, 2009
  6. Elijah NewrenApr 8, 2009
  7. layerApr 8, 2009
  8. Elijah NewrenApr 8, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.