From: Camille Moncelier <moncelier@devlife.org>
To: git@vger.kernel.org
Subject: Re: Understanding git cherry-pick
Date: Wed, 10 Nov 2010 20:43:23 +0100 [thread overview]
Message-ID: <20101110204323.0b675331@cortex> (raw)
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:
> 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
next prev parent reply other threads:[~2010-11-10 19:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <10192863.654644.1289397257054.JavaMail.root@mail.hq.genarts.com>
2010-11-10 14:04 ` Understanding git cherry-pick Stephen Bash
2010-11-10 19:43 ` Camille Moncelier [this message]
2010-11-10 20:01 ` Stephen Bash
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=20101110204323.0b675331@cortex \
--to=moncelier@devlife.org \
--cc=git@vger.kernel.org \
/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).