From: Jean-Baptiste Quenot <jbq@caraldi.com>
Date: Mon, 24 Mar 2008 18:32:39 GMT
Subject: Re: [PATCH] git-cherry-pick -x works with conflicting commits
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/