1.
Do a baseless merge
(command line). For example: tf merge /recursive /baseless
"$/TeamProject/src/External Child" "$/TeamProject/src/Parent"
2.
Check-in the changes from
the merge (can be done from Visual Studio)
3.
From Visual Studio: Right
click on "External Child" select "Branching & Merging"àReparent. Select
"Parent Branch"
The Result:
