From: Joshua Jensen <jjensen@workspacewhiz.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git merge strategy for cherry picks
Date: Wed, 23 Mar 2011 13:06:20 -0600 [thread overview]
Message-ID: <4D8A44AC.20505@workspacewhiz.com> (raw)
In this thread, the question was asked about a merge with cherry picks
and the reapplication of lines that had been removed:
http://kerneltrap.org/mailarchive/git/2010/2/19/23857/thread
Consider this scenario:
line line line re-added
+ - +!!
A -- B -- C -- F master
\ | /
- B' --...- milestone
I branch the milestone branch from A.
There is a fix, B, that needs to go in the milestone. I cleanly
cherry-pick it as B'; there are no conflicts.
The fix is decided to be bad and is removed in C.
Later, I merge the milestone branch back to master. The B 'fix' is
re-added without conflict.
How can I correctly merge milestone into master without reintroducing
the B 'fix'?
In contrast, if I run, say, 'gitk --cherry-pick master...milestone', I
see that B' is not considered a difference between master and milestone.
Thanks.
Josh
reply other threads:[~2011-03-23 19:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4D8A44AC.20505@workspacewhiz.com \
--to=jjensen@workspacewhiz.com \
--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).