1) For some reason IntelliJ is reporting that I have some variables that are not in use (greyed out) even though they are clearly in use. Furthermore if I type something in the file like "blah blah" it is ref for a second and then is fine again and IntelliJ does not report any syntax errors.
2) When I do an merge from another branch in svn via IntelliJ. My conflicts are reported but not visible. If I bring the IntelliJ diff tool back up to make resolve the conflicts, when I say "Ok" it asks if I want to use memory changes or reload from the FS. If I reload from FS I will see my changes.
I'm on mac osx if that makes a difference.