>multiple checkout has been the solution.

Good. Just be sure you don't try to merge changes on any of the other binary files (forms, class libraries): the Project is the only one this will work well on, because of the way that the Source Code Integration works.