I'm using the CVS integration. During an update, a conflict was detected, and the corresponding file was marked red. That's good. I edited the file and fixed the conflicts.
Afterwards, the file is still red. My thought is that IDEA cannot tell that I've fixed the conflicts, so I use the CVS integration to update the file. CVS now says "M" (instead of "C") for the file in question, but it is still marked as red in IDEA.
Am I missing something here?