Devart Forums

Posted: **Tue 19 Feb 2013 01:20**

Hi

There is one thing which annoys me with CodeMerge and 3-way merges

I am using it for git VCS

In case of conflict situation we get something like

Code: Select all

<<<<<<< HEAD
    background: url('Images/dashboard-tile-bg.png') no-repeat;
=======
	background: url('Images/dashboard-tile-bg.png') no-repeat;
	background-size: contain;
>>>>>>> 5a1804147205ac823903181b696

This is not very useful. I have to remove these ugly conflict markers manually.

Some other comparing tools behave much friendlier.

I tried kdiff3 and Beyond Compare, both of them shows four panels:

LOCAL - BASE - REMOTE
- MERGED -

And they don't show these ugly merge conflict markers, making the whole merging experience easier.

I love CodeCompare very much, I've bought a Pro version of it.

Do you have any plans to fix the issue in a near future?

Posted: **Tue 19 Feb 2013 12:16**

Hello. Unfortunately, it won't be solved till the next version (Code Compare 3.0), please vote for it at UserVoice , in order for us to create the list of the features, that are the most necessary for our users.

Posted: **Wed 29 May 2013 00:10**

It seems that CodeCompare 3 still does not have the feature. Can we get any updates about the progress?

Posted: **Wed 29 May 2013 12:05**

I am apologize, but due to time lack of time we have postponed this task for the next release.

Posted: **Wed 29 May 2013 12:13**

Can you give any ETAs ?

Posted: **Wed 29 May 2013 12:27**

We don't release new versions more often than every three months.

Devart Forums

CodeMerge and git merge conflict markers

CodeMerge and git merge conflict markers

Re: CodeMerge and git merge conflict markers

Re: CodeMerge and git merge conflict markers

Re: CodeMerge and git merge conflict markers

Re: CodeMerge and git merge conflict markers

Re: CodeMerge and git merge conflict markers