How to resolve conlicts in CVS?

Mark McKay <[email protected]>
Newsgroups gmane.comp.java.netbeans.user-interface
Message-ID <[email protected]> 
I'm using the built in CVS client for Netbeans 4.0.  I've tried to 
update my source to reflect the current state of the project, but have 
two conflicts.  I can do a diff through the GUI and find exactly where 
the conflict lies, but cannot figure out how to commit my changes back 
to the repository, or even check out the current version in the 
repository.  What can I do?

Mark McKay
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.