From 9802c2cfd81be1a3dfadf976d9456e5a073081b4 Mon Sep 17 00:00:00 2001 From: Sam Duke Date: Mon, 14 Jul 2014 12:21:40 +0100 Subject: [PATCH 1/3] Update JetBrains.gitignore To clarify when to ignore/include *.imls as per https://intellij-support.jetbrains.com/entries/23393067 also added optionals from the same --- Global/JetBrains.gitignore | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 343bec29..157f7501 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,5 +1,7 @@ # 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: @@ -10,8 +12,12 @@ # .idea/dataSources.xml # .idea/sqlDataSources.xml # .idea/dynamic.xml +# optionals: +# .idea/gradle.xml +# .idea/dictionaries +# .idea/libraries -## File-based project format +## File-based project format - remove if using the above *.ipr *.iml *.iws From d4e192ffee77aaa40ec43e0f7f70d912d74e4705 Mon Sep 17 00:00:00 2001 From: Sam Duke Date: Tue, 15 Jul 2014 11:57:37 +0100 Subject: [PATCH 2/3] Updated following feedback removed the iml filter - this is my current best understanding of the docs, but I'm still unsure --- Global/JetBrains.gitignore | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 157f7501..f3d8960d 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -1,25 +1,22 @@ # 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 From 7ce5fbcea586cdbf3e3a46c5b231f6d1c07f60e1 Mon Sep 17 00:00:00 2001 From: Sam Duke Date: Tue, 15 Jul 2014 12:06:15 +0100 Subject: [PATCH 3/3] change iml guess that root iml needs to be ignored and others need to be shared --- Global/JetBrains.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index f3d8960d..333bdd26 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -2,6 +2,7 @@ ## Directory-based project format .idea/ +/*.iml # if you remove the above rule, at least ignore user-specific stuff: # .idea/workspace.xml # .idea/tasks.xml