Best methods to merge 2 Silverlight solutions?

Best methods to merge 2 Silverlight solutions?

I have two branches of a single Silverlight 5 solution. They are both built off of the same base project. I will be merging one into the other. Some files can be simply copied over, while others will need to merged line by line at the code level.

Thoughts as to the best practices for a merging process on such a large scale such as this?

Tools that may be useful?

Answers & Comments...

---