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.
When I have a SVN conflict then the text of the tab in the editor of that file is highlighted in red. Now I resolve the conflict and the color of the file changes back from red to black in the project tree but it stays red in the tab of the editor.
What is the file's type? If you close and reopen the file, is it the tab's label correct?