title: error: Your local changes to the following files would be overwritten by merge:
body: <p>I am not sure how to get rid of this error. I am using "bitbucket" to privately upload my projects but I am receiving  the following error even though I have deleted all the changed files. I simply want to pull the files </p>
  
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
      buf.cpp
      buf.h
  Please, commit your changes or stash them before you can merge.
  Aborting
  </code></pre>
  
  <p>This is the command I used:</p>
  
  <pre><code>git pull origin
  </code></pre>