Merge two versions of C# projects

Question

I am working on documenting a winForms project that isn't completely done being written, meaning there is another programmer who write the code right now. So I've already wrote some importent comments in a copy of the project. In addition I use sandcastle to bulid the help file.

My question: what is the best way (if there is one) to copy the comments from the old copy of the project to the new version of it? Maybe sandcastle can do something like import a documentation to a project?

I know it wasn't so smart to do so, still I have to check if there is a way to save the documentation work.

Answer 1

Visual Studio has a built in file difference function you can use to see where the two files are different. It should be then a matter of copy and paste of the changes you have made over to the "gold" copy of the file your other programmer has changed.

This link shows how to Compare two files in Visual Studio 2012

"You can invoke devenv.exe /diff list1.txt list2.txt from the command prompt or, if a Visual Studio instance is already running, you can type Tools.DiffFiles in the Command window"