VS2017 Team Explorer Diff Tool

Discussion of open issues, suggestions and bugs regarding file and folder merge tool – Code Compare
Post Reply
csegyud
Posts: 4
Joined: Thu 14 Dec 2017 12:20

VS2017 Team Explorer Diff Tool

Post by csegyud » Thu 14 Dec 2017 12:25

Hi,
I installed Code Compare standalone (free version) which offered to integrate with VS2017. The extension is there, but in Team Explorer when comparing with unmodified file (GIT) I always get the built in Diff tool instead of Code Compare. Is there s.g. I need to set up in order to be able to use this custom tool?
Thx.

mstislavs
Devart Team
Posts: 59
Joined: Mon 16 Jan 2017 12:48

Re: VS2017 Team Explorer Diff Tool

Post by mstislavs » Wed 20 Dec 2017 12:37

Hi,

Thank you for reporting the problem. Unfortunately, Code Compare does not integrate in VS GIT by default. To resolve the problem you should manually edit the gitconfig file. See the detailed infortmation in the following topic:
https://www.devart.com/codecompare/integration_git.html

Best regards,
Mstislav Sakidon
Devart Team
www.devart.com

csegyud
Posts: 4
Joined: Thu 14 Dec 2017 12:20

Re: VS2017 Team Explorer Diff Tool

Post by csegyud » Thu 21 Dec 2017 07:32

Hi, thank you for the answer. Unfortunately it did not work: VS still loads the normal diff.
Any other idea? Thx.

mstislavs
Devart Team
Posts: 59
Joined: Mon 16 Jan 2017 12:48

Re: VS2017 Team Explorer Diff Tool

Post by mstislavs » Thu 21 Dec 2017 14:48

Hi,

Thank you for your reply. Do you use the built-in GIT client for TFS? Also, please provide us with the full version of VS 2017.

Best regards,
Mstislav Sakidon
Devart Team
www.devart.com

mstislavs
Devart Team
Posts: 59
Joined: Mon 16 Jan 2017 12:48

Re: VS2017 Team Explorer Diff Tool

Post by mstislavs » Thu 21 Dec 2017 15:36

What version of GIT do you use?

Best regards,
Mstislav Sakidon
Devart Team
www.devart.com

csegyud
Posts: 4
Joined: Thu 14 Dec 2017 12:20

Re: VS2017 Team Explorer Diff Tool

Post by csegyud » Thu 21 Dec 2017 18:24

I use Team Explorer integrated into VS. I use VSTS online, with Git repositories. To open the diff view I double click a modified file on the Changes page. I'd like to use Code Compare in place of their stock diff tool.

- git version 2.14.1.windows.1
- Visual Studio 2017 Community (v15.5.2)

Thx.

mstislavs
Devart Team
Posts: 59
Joined: Mon 16 Jan 2017 12:48

Re: VS2017 Team Explorer Diff Tool

Post by mstislavs » Fri 22 Dec 2017 14:24

Thank you for the reply. Please provide us with your gitconfig file.

Best regards,
Mstislav Sakidon
Devart Team
www.devart.com

csegyud
Posts: 4
Joined: Thu 14 Dec 2017 12:20

Re: VS2017 Team Explorer Diff Tool

Post by csegyud » Fri 22 Dec 2017 14:38

Hi,
Ah, now it started working. It was my fault, I accidentally left there the previous [diff] section, which seemingly made VS or Git fool. Thank you for your agile support and sorry for the mistake.
Best,
-- cs.

mstislavs
Devart Team
Posts: 59
Joined: Mon 16 Jan 2017 12:48

Re: VS2017 Team Explorer Diff Tool

Post by mstislavs » Mon 25 Dec 2017 05:28

We are very glad to hear the problem is resolved!

Best regards,
Mstislav Sakidon
Devart Team
www.devart.com

Post Reply