TFS MergeContent API returns false without showing merge tool
I am calling the MergeContent method on the TFS Workspace (App.Instance.TFSWorspace in my example) as shown below:
bool result = App.Instance.TFSWorkspace.MergeContent(Conflict, true);
This sets the result to false, but the Merge Tool is never displayed, although the second explicity parameter specifies to use an external merge tool.
The code was originally placed in the RelayCommand after the MVVM model. Just to make sure this isn't a problem, I moved it into the code behind and the same thing still happens. Also, I am using the default TFS tool, I have no third party compare / merge tool.
Does anyone know why this is happening?
source to share
There are several possible reasons for this:
-
diffmerge.exe is not in the path of your running program The default external merge tool is diffmerge.exe, found in \ Microsoft Visual Studio 10.0 \ Common7 \ IDE (possibly depending on your version). If it is not in the path of your program, it will not be able to start the decomposition process when a conflict occurs.
-
The program does not have a user interface wrapper This can happen if your program is a service or web application. This may not be for you, but I was not completely sure about the description
Most likely problems above # 1. I would check first.
source to share