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

Re: Understanding git cherry-pick

From
Camille Moncelier <moncelier@devlife.org>
Date
Nov 10, 2010, 19:43 UTC
Message-ID
<20101110204323.0b675331@cortex>
In-Reply-To
<28509694.654669.1289397869374.JavaMail.root@mail.hq.genarts.com>

On Wed, 10 Nov 2010 09:04:29 -0500 (EST) Stephen Bash <bash@genarts.com> wrote:

Show 10 quoted lines
> git status reported the actual change we wanted from the commit
> applied cleanly; the conflicts were all added/deleted files between
> the two branches.  The commit only modifies a single file, and the
> file exists with the same name on both branches.
> 
> So what's actually going on here?  If the one changed file in the
> commit merged cleanly, why did the automatic cherry-pick fail?  Why
> does cherry-pick even care about file differences between the two
> branches that aren't modified by the commit in question?  Or is it
> user error?

Which version are you using ? I had problem using anything < 1.7.3 when the cherry-pick happened between two branches where some files changed theirs types eg: a link become a file (But not the other way around)

See: http://thread.gmane.org/gmane.comp.version-control.git/160717/focus=160717

> 
> Thanks,
> Stephen

-- Camille Moncelier http://devlife.org

Previous: Stephen BashNext: Stephen Bash
Message 2 of 3 in “Understanding git cherry-pick”
  1. Stephen BashNov 10, 2010
  2. Camille MoncelierNov 10, 2010
  3. Stephen BashNov 10, 2010

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.