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

Re: [PATCH] A more sensible error message why 'git rebase --continue' failed

From
Johannes Sixt <j.sixt@eudaptics.com>
Date
Aug 20, 2007, 09:35 UTC
Message-ID
<46C96060.7AC79FAD@eudaptics.com>
In-Reply-To
<11875724181583-git-send-email-evan@fallingsnow.net>
Evan Phoenix wrote:
> 
> The current message is a bit cryptic, indicating that only changes which contained
> merge conflicts should be added to the index, but in fact, all outstanding
> changes must be.

I don't think that all files must be added if rebase -m was used: in this case, non-conflicting changes are already in the index.

-- Hannes
Previous: Steven Grimm
Message 5 of 5 in “A more sensible error message why 'git rebase --continue' failed”
  1. A more sensible error message why 'git rebase --continue' failedEvan Phoenix, Aug 20, 2007
  2. Junio C HamanoAug 20, 2007
  3. Evan PhoenixAug 20, 2007
  4. Steven GrimmAug 20, 2007
  5. Johannes SixtAug 20, 2007

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.