title: git - stuck in endless push/pull loop due to merge conflicts
body: <p>I honestly don't understand git that well, and I'm beginning to resent even attempting to use it.</p>
  
  <p>I'm trying to push a new version of my project to my remote repository (<code>git push origin master</code>), but when I do, I get the message:</p>
  
  <pre><code>Error: failed to push some refs to 'myRepo'. Updates where rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. git pull ...) before pushing again.
  </code></pre>
  
  <p>So I try to pull (<code>git pull origin master</code>), and then I get the following error:</p>
  
  <pre><code>Error: The following untracked working tree files would be overwritten by merge: &lt;bunch of image files and a few PHP files&gt;
  </code></pre>
  
  <p>What am I doing wrong here, in plain english (and a bit of git to help me solve this)?</p>