From: Joshua Jensen <jjensen@workspacewhiz.com>
Date: Wed, 23 Mar 2011 19:06:20 GMT
Subject: git merge strategy for cherry picks
Message-ID: <4D8A44AC.20505@workspacewhiz.com>

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