----- Original Message ----- > From: "Camille Moncelier" <moncelier@xxxxxxxxxxx> > To: "Stephen Bash" <bash@xxxxxxxxxxx> > Sent: Wednesday, November 10, 2010 2:43:23 PM > Subject: Re: Understanding git cherry-pick > > On Wed, 10 Nov 2010 09:04:29 -0500 (EST) > Stephen Bash <bash@xxxxxxxxxxx> 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 ? 1.7.3 on the machine I reproduced the issue on... My coworker has something post-1.7.2 but I'm not exactly sure. Thanks, Stephen -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html