I'm evaluating Beyond Compare 3.1.11.12204 as my diff tool for VisualStudio and TFS. When 3 way merging a file, it showed up as having conflicts. Accidentally I thought I had resolved all conflicts and saved and closed Beyond Compare. It turns out, I had missed a couple of conflicts and Beyond Compare had selected to use the base/original versions of the conflicting lines.
My previous tool (KDiff3) would warn me about unresolved conflicts when I tried to save so that I couldn't make this mistake.
Does Beyond Compare 3 have an option that would make it warn if there are unresovled conflicts and I tried to save the file? If not, can it have this in the future?
My previous tool (KDiff3) would warn me about unresolved conflicts when I tried to save so that I couldn't make this mistake.
Does Beyond Compare 3 have an option that would make it warn if there are unresovled conflicts and I tried to save the file? If not, can it have this in the future?
Comment