Project settings defaults and user overrides

Hello,

I am working on a project with IntelliJ which is shared with other colleagues via Git. When the user clones the repository and opens IntelliJ, he will first need to change some of the IntelliJ settings (in File - Settings). To cut down on the repetition and reduce project setup time I wanted to commit some of the settings files (e.g. .idea/misc.xml) to Git. However, comparing some of my settings files with those of another colleague, I noticed that they differ. The changes he's made are fine for him, but if either of us pushed our settings it would overwrite the other's.

Which brings me to my question:

Is it possible to have default settings for a specific project (not all projects, just the one), but allow users to override them, and then push the defaults, but keep the user changes out of Git?

Searching yielded no results, so I am guessing this is currently not possible but wanted to check before I open an issue on the Jetbrains YouTrack. The easiest solution I can come up with would be to have “default” settings files and “user” settings files, so e.g. .idea/misc-default.xml and .idea/misc.xml. In the example given, misc-default.xml would then get pushed to the repository, but misc.xml would be added to .gitignore.