We are building an ASP.Net MVC web app that interacts with TFS API. When we do a merge through the API, it does not display the 'Resolve Conflicts' window or the internal merge tool window. Can we force this window to come up in an ASP.Net MVC View and wait for user feedback from TFS internal merge tool ?
workspace.MergeContent(conflict, true) --> is returning 'False'
without displaying the conflict resolution window.
Note: this window/functionality was working fine when our app was a desktop Windows forms application.
No. There is no web equivalent of the conflict resolution window. That's why it worked when it was a desktop application and doesn't work anymore.