Re: conflict

[Rob Helmer]

It's been awhile since I used WinCVS seriously, but as I recall
a file that had conflicts would get a red mark and you could right-click
on it and diff to the previous version, double-click to edit it and check
it back in.

What are you having a problem with exactly? WinCVS doesn't come with
a graphical diff IIRC, but they suggest a decent one you can download
( non-free I think ).


On Fri, Mar 09, 2001 at 03:00:44PM -0800, address@hidden wrote:
> How do you fix a conflict on WinCVS before checking it in?  I know based 
> on CVS, you fix the problem and commit the file, but using WinCVS, there 
> doesn't seem to be way to check to see where the conflict is and fix the 
> error.
> 
>