In case of file cache conflicts, intellij asks if the file should be loaded again from disk. But Intellij saves my file and discards any changes from disk (in our case, the changes of the other developer), see also http://www.intellij.net/tracker/idea/viewSCR?publicId=18710
When will this bug be fixed? I think its a very dangerous bug because it destroy some data in the background.
Ok, we will informed because the file cache conflict dialog pops up, but the file is already overwritten with no hope to see the overwritten changes!
Please, fix it soon!!!