Auto Merge and Show Conflicts Only Mode
Auto Merge and Show Conflicts Only Mode
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.
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.
Re: Auto Merge and Show Conflicts Only Mode
To my mind, yes, it is. Try...tridy wrote:Hi.
I am trying to see if CodeCompare is a good replacement for the standard merge tool.
-
- Posts: 1
- Joined: Tue 12 Jun 2018 10:41
- Contact:
Re: Auto Merge and Show Conflicts Only Mode
Was it implemented eventually?
Re: Auto Merge and Show Conflicts Only Mode
To navigate between conflicts you can use the two shortcuts
Best regards,
Mstislav Sakidon
Devart Team
www.devart.com
Re: Auto Merge and Show Conflicts Only Mode
Thanks!mstislavs wrote: ↑Fri 22 Jun 2018 07:52To navigate between conflicts you can use the two shortcuts
Best regards,
Mstislav Sakidon
Devart Team
www.devart.com
Re: Auto Merge and Show Conflicts Only Mode
And what about main problem?
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...
This is must have functionality for merging tool. Without it Code Compare is simple unusable for VCS conflicts merging :(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.
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...
-
- Devart Team
- Posts: 34
- Joined: Wed 06 Nov 2019 06:48
Re: Auto Merge and Show Conflicts Only Mode
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.
Re: Auto Merge and Show Conflicts Only Mode
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.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.
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.
-
- Devart Team
- Posts: 34
- Joined: Wed 06 Nov 2019 06:48
Re: Auto Merge and Show Conflicts Only Mode
Got it, thank you for the update and feedback.
-
- Posts: 1
- Joined: Sun 27 Sep 2020 20:06
- Contact:
Re: Auto Merge and Show Conflicts Only Mode
Thanks guys, finally caught it.
-
- Posts: 1
- Joined: Thu 08 Jul 2021 14:20
- Contact:
Re: Auto Merge and Show Conflicts Only Mode
Thanks for the links, its information very help me with the same problems