title: How do I resolve git saying "Commit your changes or stash them before you can merge"?
body: <p>I made some updates on my local machine, pushed them to a remote repository, and now I'm trying to pull the changes to the server and I get the message;</p>
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
  wp-content/w3tc-config/master.php
  Please, commit your changes or stash them before you can merge.
  </code></pre>
  <p>So I ran,</p>
  <pre><code>git checkout -- wp-content/w3tc-config/master.php
  </code></pre>
  <p>and tried again and I get the same message. I'm assuming that <code>w3tc</code> changed something in the config file on the server. I don't care whether the local copy or remote copy goes on the server (I suppose the remote one is best), I just want to be able to merge the rest of my changes (plugin updates).</p>
  <p>Any ideas?</p>