...
- close project and exit from PhpStorm
- rename ".idea" folder into ".idea.bak"
- perform VCS update on a project
- copy over following folders/files (if you have them) from ".idea.bak" info ".idea" folder (basically same files that were excluded from commit previously):
- dictionaries
- libraries
- dataSources.ids
- dataSources.xml
- workspace.xml
- tasks.xml
- deployment.xml
- start PhpStorm and open project
...