I've got a branch from trunk in TFS on which development is complete. I understand that merging back into trunk should be the next step, but due to a situation beyond my control, I am not able to do that. I'm satisfied the branch represents my complete application. Is there a merge option that will simply take the branch as the trunk?
As I read the MS documentation on MERGE, the baseless merge comes close to what I want. But, I understand that the trunk files would still be part of the result, which I do not want.