I found a couple of issues in Jira, but I'm not sure if they apply to this problem.
Is anybody already working on the following?
Did an update file, had a conclict, merge window popped up, I resolved the conflict,
clicked apply, opened the file in editor...
... and all the cvs conflict markers are still there. Have to resolve the conflicts
manually in editor.