views:

1051

answers:

2
+1  A: 

Select the file you want to merge into, i.e. the mainline file. Then execute Merge Branches. In the dialog, select the file you want to merge from, i.e. the hotfix file.

Dave Costa
i thought that merging branches would merge the branches, rather than leaving the branches branched. But it is the answer to the question - and you can't be blamed for VS design.
Ian Boyd
A: 

Go to http://www.xtremevbtalk.com/showthread.php?t=311942 and donwload my script.

Feneck91
I cant get to that page. Even after registering it says its not accessible. Is there anywhere else I can get it?
Jason