[ https://issues.apache.org/jira/browse/SOLR-14727?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]
Erick Erickson updated SOLR-14727: ---------------------------------- Description: This is a little different than I thought. Apparently it's an interaction with IntelliJ. One sequence is something like: * import the Gradle build in IntelliJ on master * switch to branch_8x on the command line * switch back to master from the command line and you can't because "untracked changes would be overwritten by..." there may be other ways to get into this bind. At any rate, I don't see a problem with adding gradle.properties gradle/ gradlew gradlew.bat to .gitignore on branch_8x only. was: This is a little different than I thought. Apparently it's an interaction with IntelliJ. One sequence is something like: * import the Gradle build in IntelliJ on master * switch to branch_8x on the command line * switch back to master from the command line and you can't because "untracked changes would be overwritten by..." there may be other ways to get into this bind. At any rate, I don't see a problem with adding gradle.properties gradle/ gradle/ gradlew gradlew.bat to .gitignore on branch_8x only. > Add gradle files to the 8x .gitignore file. > ------------------------------------------- > > Key: SOLR-14727 > URL: https://issues.apache.org/jira/browse/SOLR-14727 > Project: Solr > Issue Type: Improvement > Security Level: Public(Default Security Level. Issues are Public) > Reporter: Erick Erickson > Assignee: Erick Erickson > Priority: Major > Attachments: SOLR-14727.patch > > > This is a little different than I thought. Apparently it's an interaction > with IntelliJ. One sequence is something like: > * import the Gradle build in IntelliJ on master > * switch to branch_8x on the command line > * switch back to master from the command line and you can't because > "untracked changes would be overwritten by..." > there may be other ways to get into this bind. > At any rate, I don't see a problem with adding > gradle.properties > gradle/ > gradlew > gradlew.bat > to .gitignore on branch_8x only. -- This message was sent by Atlassian Jira (v8.3.4#803005) --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org