When you switch back to IDEA or do a project wide synch, it seems like the handful of files in the editor should be synched immediately and before all the other synching. You'd be less likely to get that conflict on disk dialog message. It also seems like the if you open a file in the editor, its should likewise do an immediate synch. Maybe it already does this? If not, should I open a request for enhancement?