-
Notifications
You must be signed in to change notification settings - Fork 83.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update JetBrains.gitignore #3021
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't merge this in it's current form without more context, for a few reasons:
- it adds rules that exist (or should exist) in other templates that are separate to the JetBrains IDEs
- it overlaps with some existing opt-in rules in the template
- it excludes files that could be version controlled and shared in a team
@@ -44,6 +44,16 @@ cmake-build-*/ | |||
# IntelliJ | |||
out/ | |||
|
|||
# Eclipse |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These rules are already captured in Global/Eclipse.gitignore
.
# Intellij | ||
.idea/ | ||
*.iml | ||
*.iws |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This rule is a duplicate from the existing rule on line 42.
@@ -64,3 +74,7 @@ fabric.properties | |||
|
|||
# Android studio 3.1+ serialized cache file | |||
.idea/caches/build_file_checksums.ser | |||
|
|||
# Maven |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please submit a fresh PR with context into this template if you have Maven-specific changes to propose: Maven.gitignore
|
||
# Intellij | ||
.idea/ | ||
*.iml |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have a section earlier in the template that talks about additional rules that can be enabled when you are using Maven, which might be relevant:
gitignore/Global/JetBrains.gitignore
Lines 27 to 33 in 7eef17f
# 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/modules |
.settings/ | ||
|
||
# Intellij | ||
.idea/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The start of this file has a set of more explicit exclusions inside .idea/
for things that should not be version controlled, and this rule here will ensure everything else is excluded. I'm still in favour of committing things that can be shared, based on the guidance from JetBrains here: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
Hi Brandan,
Sorry for this pull request I made it by mistake..I’m new at git and still learning..please ignore it.
Thanks!
Trimis de pe iPhone‑ul meu
Pe 7 apr. 2019, la 14:57, Brendan Forster <notifications@github.com> a scris:
… @shiftkey commented on this pull request.
I can't merge this in it's current form without more context, for a few reasons:
it adds rules that exist (or should exist) in other templates that are separate to the JetBrains IDEs
it overlaps with some existing opt-in rules in the template
it excludes files that could be version controlled and shared in a team
In Global/JetBrains.gitignore:
> @@ -44,6 +44,16 @@ cmake-build-*/
# IntelliJ
out/
+# Eclipse
These rules are already captured in Global/Eclipse.gitignore.
In Global/JetBrains.gitignore:
> @@ -44,6 +44,16 @@ cmake-build-*/
# IntelliJ
out/
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
This rule is a duplicate from the existing rule on line 42.
In Global/JetBrains.gitignore:
> @@ -64,3 +74,7 @@ fabric.properties
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
+
+# Maven
Please submit a fresh PR with context into this template if you have Maven-specific changes to propose: Maven.gitignore
In Global/JetBrains.gitignore:
> @@ -44,6 +44,16 @@ cmake-build-*/
# IntelliJ
out/
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
We have a section earlier in the template that talks about additional rules that can be enabled when you are using Maven, which might be relevant:
https://github.com/github/gitignore/blob/7eef17f37c63ce3cbddbdd154ff836f370d0ad70/Global/JetBrains.gitignore#L27-L33
In Global/JetBrains.gitignore:
> @@ -44,6 +44,16 @@ cmake-build-*/
# IntelliJ
out/
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
The start of this file has a set of more explicit exclusions inside .idea/ for things that should not be version controlled, and this rule here will ensure everything else is excluded. I'm still in favour of committing things that can be shared, based on the guidance from JetBrains here: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or mute the thread.
|
@OvidiuBujor no problem! I'm going to close this out but feel free to submit other pull requests in the future if you think there are opportunities to improve these templates. |
Reasons for making this change:
TODO
Links to documentation supporting these rule changes:
TODO
If this is a new template: