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
You could try to use the TF Merge command