Sorry about that, it'll teach me to just use the intellij built in git command. I reverted .idea/.name and all three the iml files to the status before I made that commit. And indeed, yes, for one reason or another the project files got changed by importing the project in intellij 14.