I just upgraded to 6.0.4. The other members of my team are still on 5.1.x. It appears the format of the iml files are different enough that we can't share updates through cvs until we all get on the same version. I tried updating the .cvsignore file in each module's root to exclude *.iml, however this doesn't seem to work. When I do a cvs update through Idea, I still get told that I've made changes to the iml files. I even got a warning dialog because of a conflict. (I told it to skip the change.) I even restarted Idea. Is this correct? It doesn't sound like it. Any suggestions on how I can handle this?