title: Git asks me to commit or stash changes on checkout master, even though all changes were committed?
body: <p>I have two branches locally, <code>master</code> and <code>Berislav</code>. The latter is currently active, and I have committed all the changes. When I try to checkout to <code>master</code>, I get the following message:</p>
  
  <blockquote>
    <p>error: Your local changes to the following files would be overwritten
    by checkout: [list of files changed in the active branch] Please,
    commit your changes or stash them before you can switch branches.
    Aborting</p>
  </blockquote>
  
  <p>However, everything else I tried -- <code>commit</code>, <code>status</code>, <code>merge</code> -- tells me that there's nothing to commit (working directory clean). What do I need to do to get to my <code>master</code> branch?</p>
  
  <p>EDIT: When I try <code>git stash</code>, I'm getting:</p>
  
  <blockquote>
    <p>error: feeding unmodified [file path] to diffcore</p>
  </blockquote>
  
  <p>for all the files listed in the error above.</p>