title: Your local changes to the following files would be overwritten by merge: exclude folder
body: <p>I have this error however am unsure how to go about fixing it in the current situation. </p>
  
  <p>I have tried to use git for deployment with Magento 2 which works fine for minor changes however i attempted a version update. I removed the folders vendor and lib from gitignore and attempted the update on development machine and pushed to production. This had a lot of errrors so i reverted the filesystem and just updated manually.</p>
  
  <p>Now however am unsure how to git pull without this error.</p>
  
  <p>Should i just stash the changes or will this mess up the update? I basically want to ignore some folders or something so the update changes are still present but i can also merge my latest changes.</p>