Re: Understanding git cherry-pick

On Wed, 10 Nov 2010 09:04:29 -0500 (EST)
Stephen Bash [off-list ref] wrote:

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