Hi folks,
I've made a fork of some codeplex project. Done some extra code, etc and have even pulled my custom code into the source control repo.
In those few weeks and months since i was working on my own fork, their main trunk has been updated.
how can i sync my code with that of the trunk?
(the main reason for me wanting to sync my code with the trunk is that they upgraded to vs2010 and i'm still using a vs2008 project version :( ).