|
Hi
I'm receiving the error "TF10201: Source control could not start the manual merge tool." when I'm trying to resolve a conflict during checkin. The scenario is as follows:
I have 1 file $/TeamProject/Dev/MyFile.h that has been branched to $/TeamProject/Branch/MyFile.h
I have made changes to both the "Dev" and the "Branch" file, and then done a merge from "Dev" to "Branch", this creates a pending merge on "Branch" (as expected).
Now I try to checkin the pending change and receive a conflict (also as expected), I click "Resolve" and select "merge changes in merge tool" and then I get the above error message.
If I try to resolve this from the commandline using "tf.exe resolve" it behaves slightly different, I first get the error "The file C:\temp\TFSTemp\vctmp553628.h is not available.", followed by TF10201.
The temp file mentioned doesn't exist at the specified location, there is however a temp file with a different name that disappears when the resolve window is closed...
All the other resolution and compare options seem to work, but not the manual merge.
Can anyone give me a hint what's going wrong here??
Johan Nyvaller - Build responsible ABB Robotics |