More Git Magic

[Thomas Passin]

From time to time Git issues show up here.  My understanding about using Git is very superficial, to say the least.  Today's column from Raymond Chen, in The Old New Thing, discusses a complex situation.  I don't really understand it yet, but the post might be worthwhile for other Git users to look at:

I did that merge-as-cherry-pick thing, but my change still didn’t merge correctly