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: 102
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

LKucher
Posts: 1
Joined: Fri 17 Jan 2020 15:06
Location: Ireland
Contact:

Re: Auto Merge and Show Conflicts Only Mode

Post by LKucher » Fri 17 Jan 2020 15:09

mstislavs wrote:
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
Thanks!

Kirsan
Posts: 2
Joined: Thu 11 Jun 2020 14:08

Re: Auto Merge and Show Conflicts Only Mode

Post by Kirsan » Thu 11 Jun 2020 14:21

And what about main problem?
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.
This is must have functionality for merging tool. Without it Code Compare is simple unusable for VCS conflicts merging :(
Imagine: I use git merge on a big file with lots of changes from both sides, and as a result have only one conflict. To resolve it I use Code Compare... And what I see? To resolve one conflict I need manually merge all other non conflicting changes!!! Merge tool must have a button to automerge non conflicting changes and live for user only conflicting one. As tridy said 9 years ago...

ekaterinag
Devart Team
Posts: 25
Joined: Wed 06 Nov 2019 06:48

Re: Auto Merge and Show Conflicts Only Mode

Post by ekaterinag » Mon 15 Jun 2020 07:44

Hi, there's an auto merge functionality in Code Compare, and conflicts are marked in red. Please provide us with the files you are trying to compare via https://www.devart.com/company/contactform.html, since we'll need to investigate your case.

Kirsan
Posts: 2
Joined: Thu 11 Jun 2020 14:08

Re: Auto Merge and Show Conflicts Only Mode

Post by Kirsan » Mon 15 Jun 2020 08:48

ekaterinag wrote:
Mon 15 Jun 2020 07:44
Hi, there's an auto merge functionality in Code Compare, and conflicts are marked in red. Please provide us with the files you are trying to compare via https://www.devart.com/company/contactform.html, since we'll need to investigate your case.
Oh, I just figured out that CC done it automatically on opening - the Result file is auto merged file. And show base file button bring traditional remote-base-local view. I read docs about 3 way merge again and fount it in the description of Result.
I think you need to somehow more focus the user's attention on how to make auto merge both in the program and in the documentation.
Thank you.

ekaterinag
Devart Team
Posts: 25
Joined: Wed 06 Nov 2019 06:48

Re: Auto Merge and Show Conflicts Only Mode

Post by ekaterinag » Mon 15 Jun 2020 10:02

Got it, thank you for the update and feedback.

peterdanaver
Posts: 1
Joined: Sun 27 Sep 2020 20:06
Contact:

Re: Auto Merge and Show Conflicts Only Mode

Post by peterdanaver » Sun 27 Sep 2020 20:15

Thanks guys, finally caught it.

Post Reply