I don't have any great ideas, and I've never had to do this, but this article might give some hints for approaches to experiment with.
http://stackoverflow.com/questions/449541/how-do-you-merge-selective-files-with-git-merge Seems like it's a general git issue?
pgpFiMp1T4WOJ.pgp
Description: OpenPGP digital signature
