Generating MSVC project files for varedittest

Good evening!

I was told to get this particular branch - 
http://crystalspace3d.org/trac/CS/browser/CSExtra/branches/soc/editor/apps 
and merge it into my own branch. However, I didn't manage to do that 
because of merge errors. (both in Tortoise SVN and svnmerge.py) Is there 
a way to do this more elegantly?

I have tried doing it manually and just copy some of the 
varedittest-related files to my working folder, but I ended up having 
problems with missing project files for Visual Studio. (After giving it 
some thought, I have decided to work on this project on Windows, as I am 
much more comfortable when it comes to coding and debugging in Visual 
Studio.)

I would be very glad if someone could give me some pointers as to how I 
could efficiently get the code that I need in place.

Thanks in advance,
Andrei Bârsan

------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/