conflict

[yuchan . kim]

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.