Comparing inside VS

Discussion of open issues, suggestions and bugs regarding file and folder merge tool – Code Compare
Post Reply
StaffanW
Posts: 4
Joined: Thu 19 Apr 2012 09:15

Comparing inside VS

Post by StaffanW » Wed 05 Nov 2014 14:45

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

AlexeyN
Devart Team
Posts: 244
Joined: Wed 12 Sep 2012 12:09

Re: Comparing inside VS

Post by AlexeyN » Thu 06 Nov 2014 11:00

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

StaffanW
Posts: 4
Joined: Thu 19 Apr 2012 09:15

Re: Comparing inside VS

Post by StaffanW » Wed 12 Nov 2014 09:31

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.

AlexeyN
Devart Team
Posts: 244
Joined: Wed 12 Sep 2012 12:09

Re: Comparing inside VS

Post by AlexeyN » Wed 12 Nov 2014 09:49

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

Image

StaffanW
Posts: 4
Joined: Thu 19 Apr 2012 09:15

Re: Comparing inside VS

Post by StaffanW » Wed 12 Nov 2014 13:41

That's it - thank you!

Post Reply