Merges on IntelliJ IDEA .IPR and .IWS files

Question

We keep our IntelliJ .IPR and .IWS files in our source control, but they keep getting modified by IntelliJ just by opening them, even without any work being done on the proj

Answer 1

We add an extension to the ones checked into source control (.deleteme). Then new people can check out the project, change the extensions, and go. If we make config changes, we update the checked in files.