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)
So I need to determine all the actual changes that were made so I can replicate them by hand (as the change logs aren't detailed enough).
Are there any project file diff tools that take changed GUIDs / positions into account?