For Java projects I have resigned myself to not committing any of the IntelliJ project files and instead just teaching the Gradle

idea

task how to correctly generate the project files.