Updated following feedback

removed the iml filter - this is my current best understanding of the docs, but I'm still unsure

Global/JetBrains.gitignore

 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
-## For directory vs file based set-ups, see: https://intellij-support.jetbrains.com/entries/23393067
-
 ## Directory-based project format
 .idea/
 # if you remove the above rule, at least ignore user-specific stuff:
 # .idea/workspace.xml
 # .idea/tasks.xml
+# .idea/dictionaries
 # and these sensitive or high-churn files:
 # .idea/dataSources.ids
 # .idea/dataSources.xml
 # .idea/sqlDataSources.xml
 # .idea/dynamic.xml
-# optionals:
+# and, if using gradle::
 # .idea/gradle.xml
-# .idea/dictionaries
 # .idea/libraries
 
-## File-based project format - remove if using the above
+## File-based project format
 *.ipr
-*.iml
 *.iws
 
 ## Additional for IntelliJ