title: git: how to pull latest changes and resolve conflicts
body: <p>I want to pull in all the latest changes from a github repo. There is only one branch and only one person (the developer) adds and modifies the code. I simply pull everything in, once a new feature is added. </p>
  
  <p>Normally, all I do is:</p>
  
  <pre><code>git pull
  </code></pre>
  
  <p>But this time I got an error message which reads:</p>
  
  <blockquote>
    <p>Automatic merge failed; fix conflicts and then commit the results. </p>
  </blockquote>
  
  <p>I'd simply like to pull in the latest changes from the repo. I'm not sure why there are conflicts when only one person is responsible for this repo. </p>
  
  <p>Note: I don't want to commit anything to the repo.</p>