Intellij SDK Settings checked into a source repository

We have our Intellij (13) project settings checked into a git repository. I want to configure Intellij’s Python interpreter within the project. To do this I need to add the SDK under “Platform Settings” and then select it in “Facets” under “Project Settings”. The latter is checked-in, but the former is a global setting which we haven’t checked in. If I commit the project settings change, other developers will merge that change but then Intellij will overwrite it because the SDK name is not configured in platform settings.

How can I get around this? It seems like the only way is to have a script modify the global settings files, but that’s just nasty.

  • The proper way to “merge” this situation
  • What do you do with your branch after a pull request on GitHub?
  • Is there a “polite” way to maintain a local mirror of Drupal.org projects?
  • Is there a menu like interactive commit for SVN like Git has with --interactive?
  • What is the Sign Off feature in Git for?
  • Merge two Git branches, but exclude certain files
  • GitHub - merging changes to a branch in different folder from master
  • CI in GIT: how to revert multiple commits of a feature
  • How can I delete a commit to git
  • Ignoring directories in earlier commits
  • Git - recover intermediate commits after squash
  • “gcloud source repos clone default local-directory-name” not working
  • One Solution collect form web for “Intellij SDK Settings checked into a source repository”

    Could you make use of Git Hooks, e.g.: the post-checkout hook which would then set these settings for you? Of course there would be a script to do this, but it would be executed automatically

    Git Baby is a git and github fan, let's start git clone.