This project is read-only.
3
Vote

VS 2013 ExtendedMerge - Resolve Conflicts Dialog is Modal and not a Tabbed Page

description

I have converted the ExtendedMerge code over to VS 2013 and seems to be running fine with the one exception of the Resolve Conflicts dialog box. When you are prompted if you want to resolve the conflict(s), the window pops open as a modal window. If you only click on the auto resolve buttons you are good but if you click on the "Resolve in Merge Tool" button it opens the TFS resolve conflicts tabbed page. Sounds fine but when you try to click on the tab you cant access anything because the original Resolve Conflicts dialog popup window is displayed as modal and undockable so you are forced to either click on one of the auto resolve buttons or cancel out.

The offending code is ...
dlgResolveConflicts.InvokeMember("ResolveConflicts", BindingFlags.InvokeMethod | BindingFlags.NonPublic | BindingFlags.Static, null, null, new object[] { wrkspc, null, true, null });
This brings up the modal dialog window.

Can we get this issue resolved with a work around or fix?

Thanks

file attachments

comments

borgesroberto wrote Oct 7, 2014 at 2:31 PM

Can we have this version for download ?

wrote Nov 7, 2014 at 11:42 PM

wrote Feb 24, 2015 at 10:51 PM

smiles2424 wrote Feb 24, 2015 at 10:51 PM

Please share your version.