title: What causes this git warning?
body: <p>Lately whenever I do a git push I get an exchange like this:</p>
  
  <pre><code>owner-pc ~/dev/project $ git push
  Counting objects: 15, done.
  Delta compression using up to 4 threads.
  Compressing objects: 100% (8/8), done.
  Writing objects: 100% (8/8), 3.15 KiB, done.
  Total 8 (delta 6), reused 0 (delta 0)
  remote: Pulling changes into edge...
  remote: From /var/git/project
  remote:  * branch            master     -&gt; FETCH_HEAD
  remote: error: Your local changes to 'config/development.php' would be overwritten by merge.  Aborting.
  remote: Please, commit your changes or stash them before you can merge.
  remote: Updating 1984db9..d584535
  remote: Changes have been pulled and applied to edge.
  To ssh://dev.trueaction.com/var/git/project
     a3a085e..8ec5b07  styleguide -&gt; styleguide
  </code></pre>
  
  <p>…but the push apparently completes without error, and everything works fine. There are no local changes to <code>config/development.php</code>, nor have their been for some time. I don't get any errors or warnings on commit, only on push, and not on pull.</p>
  
  <p>What causes the error? (It behaves like a <em>warning</em>, but says it's an <em>error</em>, so I'm going with that term.)</p>