cherry picking and merge

Cherry picking doesn’t work as well as it should.  I was testing on git version 1.7.9.5.

Put in a line in a file, call it:

first version

then cherry pick this into your branch. Then update on master and transform that into:

second version

then, merge that branch back to master.  Death in the form of conflicts.

In gcc land, I do this sort of thing all the time, and I need a merging subsystem to actually keep track of things.  I can manage this will diff and patch and it works flawlessly.  The point of using something better than diff and patch is for it to be better than diff and patch.

I’d like for merge to merge in the work that has yet to be merged.  Not that, plus blindly try and apply or reapply cherry picked items.