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

Re: [minor BUG] cherry-pick -x doesn't work if a conflict occurs

From
Jay Soffian <jaysoffian@gmail.com>
Date
Jan 5, 2011, 16:37 UTC
Message-ID
<AANLkTi==nMhcN538ekww3FEYFxhOqDqj4_Z7xg0a0B0Z@mail.gmail.com>
In-Reply-To
<AANLkTimi8s7QRYuEgr2x=bqwEuFPqUUQF4E=f=_PsoV0@mail.gmail.com>
2011/1/5 Jay Soffian <jaysoffian@gmail.com>:
> 2011/1/5 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
>> ah, I wonder if this is intended or just documenting a short-coming :-)
>
> I think it's intended as it's no longer the original commit, but
Ah, seems to be a documented short-coming after-all:
  http://thread.gmane.org/gmane.comp.version-control.git/61737/focus=61933
j.
Previous: Jay SoffianNext: Junio C Hamano
Message 5 of 6 in “[minor BUG] cherry-pick -x doesn't work if a conflict occurs”
  1. Uwe Kleine-KönigDec 29, 2010
  2. Robin RosenbergJan 5, 2011
  3. Uwe Kleine-KönigJan 5, 2011
  4. Jay SoffianJan 5, 2011
  5. Jay SoffianJan 5, 2011
  6. Junio C HamanoJan 5, 2011

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.