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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html