title: Git workflow: "Your local changes would be overwritten by merge"
body: <p>I've been working with another developer across three servers:</p>
  
  <ol>
  <li>My local VM</li>
  <li>Dev server</li>
  <li>Live server</li>
  </ol>
  
  <p>The workflow that I adopted was to, obiously, do all the work on my local VM, then pull the changes form the repomote repository to the dev server (dev branch) and live server (master beanch after merging with dev branch).</p>
  
  <p>Unfortunately, another developer modified some files, install Wordpress plugins directly on the live server. Consequently, when I attempt to bring the <code>master</code> branch on the live server up to date with <code>master</code> on the remote reposiotry, I get messages like this one:</p>
  
  <pre><code>Error: Your local changes to 'plugins/bulk-page-creator/bulk-page-creator.php' would be overwritten by merge.  Aborting.
  </code></pre>
  
  <p>Please, commit your changes or stash them before you can merge.</p>
  
  <p>I guess that these files are not tracked. I really want to avoid commiting to the remote repo from a server other than my local VM.</p>
  
  <p>What are my opitons here to resolve this problem. I just need to bring the codebase on the live server up to date with the remote repo - that's it.</p>
  
  <p>Should I somehow discard these local changes?</p>
  
  <p>I also attempted to synchronize the codebase with:</p>
  
  <p><code>git fetch</code> 
  <code>git merge FEATCH_HEAD</code></p>
  
  <p>with no luck.</p>
  
  <p>What are my options here?</p>