Other, Base, Local 3-way diff
Make it possible to use all Other, Local and Base versions of file for merging like it is implemented in kdiff3. It is helps in complex cases when Other version has changed a logic of code.
-
Regis Bittencourt commented
I was going to buy the professional but just before I realized there is a fake 3-way merge and I was going to be miss-sold I stopped. What a shame devart. Maybe call it 2-way with a panel in the bottom view? That's definitely not 3-way. Just count. One, two, errr where is the three? Three? Threeeeee? Hey it's not there.
-
Randall Hackel commented
Having used Scooter Software's BeyondCompare for years (and a bit of kidff3 when forced to do so), I can't find the Code Compare usable for merging without this feature.
I love the Visual Studio integration, but the 3-way merge just isn't viable at present.
Doesn't seem that it would be that hard to add... -
Brad commented
I absolutely agree. This would be such a huge feature when combined with the slickness of the Code Compare UI, and the integration into Review Assistant. This is great software with a major flaw.
-
Daniel Waechter commented
This is the major thing keeping Code Compare from being usable for me. I'm too used to being able to see all four versions at once; it's strange to see only "Theirs/Merged/Mine" or "Theirs/Base/Mine". My typical setup shows "Theirs/Base/Mine" in columns on top, and "Merged" on the bottom (as in P4Merge).