Re: How to resolve conlicts in CVS?

I think running "CVS|Update" on your [Locally Modified; 1.__] file will end up in having [Merge Conflicts] annotation. Run "Resolve Conflicts" action to invoke conflicts resolver which will help you a lot. For more information use "IDE Basics|Using Version Control with the IDE|Resolving Merge Conflicts" help topic in "Help|Help Contents" from main menu.

-Jirka

Mark McKay wrote:

> 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