In case somebody else stumbles onto this issue, the best luck I’ve had is
Settings > Version Control > Ignored Files
Add “Ignore all Files Matching”s for:
*.idea
*.iml
Not sure which version of IDEA rolled out this functionality, and this question is somewhat old, so it may be moot. Just hope it helps somebody else out who landed here from Google as I did.