AutoMerge feature when usage is in TFS 2010

Discussion of open issues, suggestions and bugs regarding file and folder merge tool – Code Compare
Post Reply
some1no
Posts: 1
Joined: Tue 05 Aug 2014 15:20

AutoMerge feature when usage is in TFS 2010

Post by some1no » Tue 05 Aug 2014 17:49

Hi dear, i read into one of your forum (or question) somebody asking you about «AutoMerge feature», here is the topics «http://forums.devart.com/viewtopic.php?f=36&t=27823».
My question is, when we implemented «code compare» for using inside tfs 2010 and we merged some part. At the conflict resolution panel, if we have «autoMerge» button, this is tfs code who works, or this is «code compare» features ?
Thank you (hope my english was not too bad to understand) :D .

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

Re: AutoMerge feature when usage is in TFS 2010

Post by AlexeyN » Mon 11 Aug 2014 10:33

Hello. That 'Auto merge' button is a TFS feature.
When you launch merge in Code Compare, it tries to merge itself, creating its own result file, because some VCS do not return a result file (or return something strange sometimes). That is our "Auto merge" feature.

Post Reply