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

Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 17, 2016, 15:31 UTC
Message-ID
<xmqqa8gbbee8.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<1592315356.1230893.1471443850115.JavaMail.zimbra@ensimag.grenoble-inp.fr>

Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:

> Either way (3 or 4 lines) I find it strange to have both advices
> start in the same way except that one is split and not the other.
True.
Previous: Remi Galan AlfonsoNext: Johannes Schindelin
Message 5 of 8 in “Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits”
  1. Stephen MortonAug 10, 2016
  2. Christian CouderAug 14, 2016
  3. Stephen MortonAug 17, 2016
  4. Remi Galan AlfonsoAug 17, 2016
  5. Junio C HamanoAug 17, 2016
  6. Johannes SchindelinAug 18, 2016
  7. Remi Galan AlfonsoAug 16, 2016
  8. Johannes SchindelinAug 17, 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.