This is something I\'ve come across twice in the past month and I\'m not even certain how to phrase this as a Google query.
I\'m actually using SVN for all of this,
Put all shared files in a separate folder in either one of the projects or in a separate one. Then use externals to reference that folder. Mixing files from different places in the same folder is a bad idea.