When you use VSS client in VS and you execute check-in on some source files, in case of conflicts that can be merged, they are merged and AFTER that the dialog with info is displayed that the sources were merged.
How to configure it in such way, that the dialog will appear with info BEFORE merge showing me the differences?
Visual Studio 2012, Visual Source Safe 8.0, please don't comment on the tools, company choice, not mine.
Please go to Tools->Options->Source Control->Plugin settings, click Advanced button. Under General tab, set 'Use visual merge' to YES and try again to see how it works.