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

Re: Unexpected cherry-pick behaviour

From
Paulo Matos <paulo@matos-sorge.com>
Date
Dec 11, 2013, 10:04 UTC
Message-ID
<7050e7272bb83d083a56a2c391228ed8@matos-sorge.com>
In-Reply-To
<xmqqvbywts9d.fsf@gitster.dls.corp.google.com>
On 10/12/2013 19:34, Junio C Hamano wrote:
Show 6 quoted lines
> Perhaps immediately after "cherry-pick" stopped and asked your help
> to resolve the conflicts, running
> 
> 	$ git checkout --conflicts=diff3 gcc/tree-ssa-threadedge.c
> 
> and looking at the file again may show you what is going on better.

I don't know how to interpret the fact that the line you sent (with the obvious --conflicts being --conflict) outputs nothing...

Any suggestions?
-- 
Paulo Matos
Previous: Junio C HamanoNext: Antoine Pelisse
Message 3 of 13 in “Unexpected cherry-pick behaviour”
  1. Paulo MatosDec 10, 2013
  2. Junio C HamanoDec 10, 2013
  3. Paulo MatosDec 11, 2013
  4. Antoine PelisseDec 11, 2013
  5. Paulo MatosDec 11, 2013
  6. Antoine PelisseDec 14, 2013
  7. Philip OakleyDec 14, 2013
  8. Junio C HamanoDec 14, 2013
  9. Philip OakleyDec 15, 2013
  10. Philip OakleyDec 16, 2013
  11. Junio C HamanoDec 16, 2013
  12. Junio C HamanoDec 14, 2013
  13. Antoine PelisseDec 14, 2013

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.