* git merge strategy for cherry picks
@ 2011-03-23 19:06 Joshua Jensen
0 siblings, 0 replies; only message in thread
From: Joshua Jensen @ 2011-03-23 19:06 UTC (permalink / raw)
To: git@vger.kernel.org
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-23 19:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-23 19:06 git merge strategy for cherry picks Joshua Jensen
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).