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
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?