This Question is Possibly Answered

1 "correct" answer available (4 pts) 2 "helpful" answers available (2 pts)
1 Replies Last post: Feb 17, 2014 4:43 PM by Elena Pogorelova  
irobot8 Newbie 7 posts since
Aug 24, 2013
Currently Being Moderated

Feb 14, 2014 4:56 PM

PHP Storm 7.0 - Version Control ignored files

Hi,

 

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,

 

IR8

Elena Pogorelova Apprentice 835 posts since
Oct 5, 2011
Currently Being Moderated
Feb 17, 2014 4:43 PM in response to: irobot8
Re: PHP Storm 7.0 - Version Control ignored files

Hello!

 

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

More Like This

  • Retrieving data ...