title: VS 2017 deletes files/folder on me
body: <p>VS 2017 (v15.6.6 Enterprise) deletes files/folder on me and my team members consistently. We have lost so many code because of these kind of bugs. </p>
  
  <p>One case is when someone moves the file/folder and another team member modifies it before getting latest. In this case, conflicts window appear as it should but it deletes the local file (unrecoverably) and we end up getting the server version because it doesn't allow us to merge the file since it doesn't exist in local (yes, because it deleted the file).</p>
  
  <p>Another issue is that padlock icons appear in some files and doesn't appear in others (padlocked files change between teammembers. e.g. File A might be padlocked in my local and might not be padlocked in another person or vice versa). </p>
  
  <p>We decided to shelve all of our changes before checkin in now as a solution. Or we will downgrade to VS 2015 if these issues continue. What are our options? We mapped/unmapped the projects several times already. </p>