From 468a00afc9f8b06dae64a5e290be10034d9b8dcd Mon Sep 17 00:00:00 2001 From: Shawn Kovalchick Date: Fri, 29 Jun 2018 08:50:57 -0400 Subject: [PATCH 1/3] JetBrains: Optional excludes for auto-import Add extra commented section to use when using Gradle or Maven auto-import. These are mentioned in the original reference for optional excludes (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839). If this would be better as a separate, non-commented ignore file, let me know and I will resubmit. --- Global/JetBrains.gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 02d16aae..9cd884a2 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -21,6 +21,14 @@ .idea/**/gradle.xml .idea/**/libraries +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/modules.xml +# .idea/**/*.iml +# .idea/libraries/**/*.xml + # CMake cmake-build-*/ From 84557f4423a4898ee7bcc9dd5c1f677b2527f1f1 Mon Sep 17 00:00:00 2001 From: Shawn Kovalchick Date: Fri, 29 Jun 2018 14:54:03 -0400 Subject: [PATCH 2/3] Remove duplicate libraries entry --- Global/JetBrains.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 9cd884a2..54344927 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -27,7 +27,6 @@ # auto-import. # .idea/modules.xml # .idea/**/*.iml -# .idea/libraries/**/*.xml # CMake cmake-build-*/ From bb1c447d54a470c6110a78f6b05d0fbdb56c8fe0 Mon Sep 17 00:00:00 2001 From: Shawn Kovalchick Date: Mon, 2 Jul 2018 13:50:02 -0400 Subject: [PATCH 3/3] Separate module directory from project iml exclude --- Global/JetBrains.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 54344927..0d95b087 100644 --- a/Global/JetBrains.gitignore +++ b/Global/JetBrains.gitignore @@ -26,7 +26,8 @@ # since they will be recreated, and may cause churn. Uncomment if using # auto-import. # .idea/modules.xml -# .idea/**/*.iml +# .idea/*.iml +# .idea/modules # CMake cmake-build-*/