PHP Storm 7.0 - Version Control ignored files


I'm using TFS version control with PHP Storm 7.0.

I've configured .idea/workspace.xml in Settings > Version Control > Ignored Files.  However, when updating the project/ directory, I still get a 'Local conflict detected. Override local item?' dialog (I click 'No' to this), and then a 'Resolve Conflicts' dialog (I select the workspace.xml file here, and click on 'Accept Yours' to keep the local version).

Does anyone know why workspace.xml isn't being ignored for TFS version control?

Many thanks,


1 comment
Comment actions Permalink


Settings > Version Control > Ignored Files only affects files that have not been added yet. Did you add  workspace.xml to the repository? If yes, it will be commited despite  being added to ignore list


Please sign in to leave a comment.