Ok, in TFS we have a main trunk branch and another branch, let\'s call it secondary. We have created a new file in the trunk but when trying to merge
I think this should be possible over the VS GUI as follows:
Select the folder where the new file was added and order a merge (of the whole folder) to your secondary branch.
Now all changed files of the folder appear in your pending list + your new file.
Undo all other files & proceed with checking in only the one file that matters.
One could argue that this restriction of TFS in fact makes sense: