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

Re: [RFC/PATCH] status: suggest 'git merge --abort' when appropriate

From
Stefan Beller <sbeller@google.com>
Date
Jul 21, 2016, 16:58 UTC
Message-ID
<CAGZ79kZ5So-tXRX60CTCxrsgW8Vv7QH5gXGDk89EP69Qk28Kcw@mail.gmail.com>
In-Reply-To
<20160721125837.3127-1-Matthieu.Moy@imag.fr>
On Thu, Jul 21, 2016 at 5:58 AM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:
> We already suggest 'git rebase --abort' during a conflicted rebase.
> Similarly, suggest 'git merge --abort' during conflict resolution on
> 'git merge'.
I think this is a good addition.

Thanks, Stefan

Previous: Matthieu MoyNext: Junio C Hamano
Message 2 of 3 in “status: suggest 'git merge --abort' when appropriate”
  1. status: suggest 'git merge --abort' when appropriateMatthieu Moy, Jul 21, 2016
  2. Stefan BellerJul 21, 2016
  3. Junio C HamanoJul 22, 2016

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.