Devart Forums

I have always used Code Compare integrated inside VS and that's how I like it.

When getting the latest source from TFS using command line, I got a conflict which prompted me if I wanted to resolve the conflict inside VS or standalone (or something like that). At that particular moment I didn't want to bring up a full instance of VS and chose to handle in stand alone Code Compare. Fine, but now all my comparisons are handled standalone... How do I configure it to be integrated in VS again?

Staffan

You should turn off the 'Use standalone application from command line by default' option at 'Tools -> Options -> Code Compare' menu. For more info, see the link below: http://www.devart.com/codecompare/docs/ ... dialog.htm

The problem is I don't have that option...

In VS I have the following options:
Show result choice dialog only when more than one file has been modified [Unchecked]
Activate application from command line [Unchecked]
Prevent Visual Studio closing [Checked]
Show dialog on closing [Checked]
Font Size [Default]
Use enhanced scrollbars [Checked]

In CC I have the following options:
Show result choice dialog only when more than one file has been modified [Unchecked]
Activate application from command line [Unchecked]
Prevent Code Compare closing [Unchecked]
Show dialog on closing [Disabled]

I use the latest released version of both VS and CC.

Sorry for my typo. I mean 'Environment' tab.

That's it - thank you!