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

Re: [PATCH] Improve error message in rebase conflict

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
May 30, 2010, 12:44 UTC
Message-ID
<AANLkTimiZlampV3xmfCyIhb1wbCUpGGYxtZpEYnmHIr1@mail.gmail.com>
In-Reply-To
<1275222044-511-1-git-send-email-artagnon@gmail.com>
Heya,
On Sun, May 30, 2010 at 14:20, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
Show 5 quoted lines
>                git diff-files --quiet --ignore-submodules || {
> -                       echo "You must edit all merge conflicts and then"
> -                       echo "mark them as resolved using git add"
> +                       echo "You must edit all merge conflicts and then" \
> +                           "mark them as resolved using 'git add'"
Why is this change not described in the commit message? :)
-- 
Cheers,

Sverre Rabbelier
Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 2 of 3 in “Improve error message in rebase conflict”
  1. Improve error message in rebase conflictRamkumar Ramachandra, May 30, 2010
  2. Sverre RabbelierMay 30, 2010
  3. Ramkumar RamachandraMay 30, 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.