如何将更改区分/合并到部署项目文件

I am currently using CVS (not my choice) and have several branches. I'm trying to merge two branches, but a deployment project file has conflicts that I can't resolve without spending a LOT of time. A trivial change to a project file results in drastic changes to that project file - thanks to GUID changes I guess (making a project file change, getting a clean copy and making the same change seems to yield two fairly different project files)I am currently using CVS (not my choice) and ha