If you create a branch in TFS, you can easily merge it back later, but if you have 2 branches or folders that you want to merge, but are not related (they weren't branched from one another) you need to do a baseless merge.
What is baseless merging?
The process of merging items that are not directly branched from each other is called a baseless merge. For example: you might want to merge a change between two release branches (Iteration 1 and Iteration 2), which are siblings of each other, without merging up to the parent branch (Main).
How do I merge two TFS branches?
To merge the main branch with the development branch
- Right-click the main branch, point to Branching and Merging, and then click Merge… ...
- On the Select the source and target branches for the merge operation screen: In Source branch, specify the main branch. ...
- Click Next, and then click Finish.
