Auto Merge and Show Conflicts Only Mode

Discussion of open issues, suggestions and bugs regarding file and folder merge tool – Code Compare
Post Reply
tridy
Posts: 1
Joined: Thu 26 May 2011 12:09

Auto Merge and Show Conflicts Only Mode

Post by tridy » Thu 26 May 2011 12:29

Hi.
I am trying to see if CodeCompare is a good replacement for the standard merge tool and here is what I have problems with:

In VS2010 and TFS, when there is a conflict and CodeCompare opens, O see that both conflicting and non-conflicting changes must be resolved manually. Is there some setting that I have missed? What I would like to have is CodeCompare to merge all the non-coflicting (blue color) changes automatically and leave the conflicting (red color) to be handled manually.

Also, most of the time I would like to see something similar to standard's tool "Navigate Conflicts Only" mode. Is it possible to do that in CodeCompare?

Thanks.

Artem
Devart Team
Posts: 137
Joined: Mon 21 Jun 2010 14:02

Post by Artem » Mon 30 May 2011 13:12

Such mode is not currently supported by CodeCompare, however we will consider its implementation in future.

lidspell
Posts: 1
Joined: Fri 17 Jun 2011 09:42
Contact:

Re: Auto Merge and Show Conflicts Only Mode

Post by lidspell » Fri 17 Jun 2011 09:50

tridy wrote:Hi.
I am trying to see if CodeCompare is a good replacement for the standard merge tool.
To my mind, yes, it is. Try...

Anastasia Stefanuk
Posts: 1
Joined: Tue 12 Jun 2018 10:41
Contact:

Re: Auto Merge and Show Conflicts Only Mode

Post by Anastasia Stefanuk » Mon 18 Jun 2018 08:50

Was it implemented eventually?

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

Re: Auto Merge and Show Conflicts Only Mode

Post by mstislavs » Fri 22 Jun 2018 07:52

Anastasia Stefanuk wrote:
Mon 18 Jun 2018 08:50
Was it implemented eventually?
To navigate between conflicts you can use the two shortcuts
Image

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

Post Reply