# CVS: Merge Conflicts Resolver

The Merge Conflicts Resolver enables you to resolve conflicts between local copies of version-controlled files and the repository before committing them.

The Merge Conflicts Resolver displays the two conflicting revisions side by side in the top pane, with the conflicting areas highlighted. You resolve a conflict by accepting one of the revisions being displayed.

Element | Description
--- | ---
Next Difference | Move forward in the file to the next difference that the Merge Conflicts Resolver has identified.
Previous Difference | Move backward in the file to the previous difference that the Merge Conflicts Resolver has identified.
Accept | Each version of the file shown in the Merge Conflicts Resolver has an Accept button over the file. If one of the versions contains the content you wish to retain, click Accept. Otherwise, exit the Merge Conflicts Resolver and edit the file manually.

Click the Accept button of the revision you want to accept. The IDE merges the accepted revision with the source file. You can see the results of the merge in the bottom pane of the Merge Conflicts Resolver.

Once all conflicts are resolved, click OK to exit the Merge Conflicts Resolver and save the modified file. The Merge Conflict badge is removed from the file and you can now commit the modified file to the repository.

Related Topics

Developing Applications with NetBeans IDE,

Copyright © 2016, Oracle and/or its affiliates. All rights reserved.