TFS API MergeContent returns false without showing merge tool

后端 未结 1 1167
無奈伤痛
無奈伤痛 2020-12-22 03:58

I am calling the MergeContent method on a TFS workspace (App.Instance.TFSWorspace in my example) as shown below:

bool result = App.Instance.TFSWorkspace.Merg         


        
相关标签:
1条回答
  • 2020-12-22 04:15

    A couple of potential reasons this may occur:

    1. 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 (maybe different based on your version). If this is not in the path of your program it will fail to start the diffmerge process when a conflict occurs

    2. Program does not have a UI shell This can occur if your program is a service or web app. This may not be the case for you but I was not completely sure from the description

    Most likely the issues is #1 above. I would check that first.

    0 讨论(0)
提交回复
热议问题