title: Git telling me to pull, then commit, then pull?
body: <p>I am trying to push new changes, but I have a conflicted file. After trying to push, I get the following error:</p>
  
  <pre><code>Merge the remote changes (e.g. 'git pull') before pushing again.  See the
  'Note about fast-forwards' section of 'git push --help' for details.
  </code></pre>
  
  <p>Ok, so we need to use git pull.
  I try to use <code>git pull</code> and then I get this error:</p>
  
  <pre><code>error: Your local changes to the following files would be overwritten by merge:
      db/profile_edit.php
  Please, commit your changes or stash them before you can merge.
  </code></pre>
  
  <p>But, when I try to commit, I go back to the first error. What should I do? The changes on the remote repo are newer than the ones on my local machine. So, how do I open it up with a diff tool and make the changes and then tell git that I have made changes so it will let me push changes?</p>