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

Re: [PATCH] git-cherry-pick -x works with conflicting commits

From
JQJean-Baptiste Quenot <jbq@caraldi.com>
Date
Mar 24, 2008, 18:32 UTC
Message-ID
<ae63f8b50803241132s2938ae17s79257fdb7938ba79@mail.gmail.com>
In-Reply-To
<b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com>
All right, I see.  The conflict error message was confusing me:

------------------------------------------------------------------------ fatal: Entry 'azerty' would be overwritten by merge. Cannot merge. Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. When commiting, use the option '-c c17532f' to retain authorship and message. ------------------------------------------------------------------------

The last sentence does not make much sense when -x is specified.
Cheers,
-- 
Jean-Baptiste Quenot
http://caraldi.com/jbq/blog/
Previous: Rafael Garcia-Suarez
Message 4 of 4 in “git-cherry-pick -x works with conflicting commits”
  1. git-cherry-pick -x works with conflicting commitsRafael Garcia-Suarez, Mar 24, 2008
  2. Jean-Baptiste QuenotMar 24, 2008
  3. Rafael Garcia-SuarezMar 24, 2008
  4. Jean-Baptiste QuenotMar 24, 2008

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.