Replace the trunk with an earlier branch

[rootofunity]

Hi,

I have a visual studio solution which has a modified branch and trunk. I need to replace everything in the trunk with the branch in question. Since there has been many modifications to the branch and the trunk, i can not simply merge them. Is there an easy way to overwrite the trunk with a branch?

Thanks

[lbauer]

Merging branch into trunk would allow you to move changes from the branch into the trunk, while maintaining changes in the trunk. It wouldn't overwrite changes in the trunk unless you specifically choose to do that.
But you could choose to overwrite the changes in the trunk.

However, If you don't want to merge, then a workaround would be to checkout everything in the trunk, GET everything in the branch, then replace the contents of the trunk's working folder with items from the branch.