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

Re: Problem with git merge/rebase with conflicts

From
Junio C Hamano <gitster@pobox.com>
Date
May 6, 2010, 19:13 UTC
Message-ID
<7v8w7wj134.fsf@alter.siamese.dyndns.org>
In-Reply-To
<19426.38028.501924.921359@winooski.ccs.neu.edu>
Eli Barzilay <eli@barzilay.org> writes:
> 1. I get this:
> 3. Again, starting from the same setup:

I don't have time to look at the second one, but these are quite obvious and natural. "status" in these cases notices that you haven't made any change relative to HEAD (in either the index nor in the working tree) after all, and that is what is being reported.

Previous: Eli BarzilayNext: Eli Barzilay
Message 2 of 5 in “Problem with git merge/rebase with conflicts”
  1. Eli BarzilayMay 6, 2010
  2. Junio C HamanoMay 6, 2010
  3. Eli BarzilayMay 6, 2010
  4. Jeff KingMay 8, 2010
  5. Eli BarzilayMay 8, 2010

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.