by XDK
9. December 2013 12:00
Solution:
Solution is to perform a baseless merge using Tf.exe. Following are the steps
1. Perform a Baseless Merge Using Tf.exe
- Open command prompt
- cd "<Work space folder>"
- execute tf merge /recursive /baseless "Parent Folders\Files" "Child Folders\Files"
Example: tf merge /recursive /baseless "$\Project A\Development" "$\Project A\Release\V1.0"
2. Resolve Merge Conflicts
3. Check-In the Merged Changes
You should see the relationship established between folders\files
Subscribe