From: "Jean-Baptiste Quenot" <jbq@caraldi.com>
To: "Rafael Garcia-Suarez" <rgarciasuarez@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-cherry-pick -x works with conflicting commits
Date: Mon, 24 Mar 2008 19:32:39 +0100 [thread overview]
Message-ID: <ae63f8b50803241132s2938ae17s79257fdb7938ba79@mail.gmail.com> (raw)
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/
prev parent reply other threads:[~2008-03-24 18:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-24 10:41 [PATCH] git-cherry-pick -x works with conflicting commits Rafael Garcia-Suarez
2008-03-24 13:55 ` Jean-Baptiste Quenot
2008-03-24 14:52 ` Rafael Garcia-Suarez
2008-03-24 18:32 ` Jean-Baptiste Quenot [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae63f8b50803241132s2938ae17s79257fdb7938ba79@mail.gmail.com \
--to=jbq@caraldi.com \
--cc=git@vger.kernel.org \
--cc=rgarciasuarez@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).