This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Hi, I was playing around with a local CVS repository I set up using the IDE, trying to see how the IDE deals with merge conflicts. Specifically I created a file, made several changes to the file and committed each one as a new revision, then updated to an earlier revision, altered it in a way I knew would cause a merge conflict and tried to update. The Output Window displayed "cvs [commit aborted]: correct above errors first!" as expected but the Source Editor did not refresh, thus the code that was causing the merge conflict wasn't bracketed with <<<<<<< >>>>>>> and the user doesn't know what's causing the conflict. If you close the Source Editor and open it again, however, the <<<<<<< >>>>>>> are displayed. Any way to have the Source Editor update when it runs into a merge conlfict? Let me know if you have any questions or comments. John Jullion-Ceccarelli
This is actually a duplicate of another issue that is now being repor- ted perhaps from whole the world. :-) I believe it's not CVS issue but editor's one. *** This issue has been marked as a duplicate of 13017 ***
hmmm...duplicated (no more comments:)