title: CONFLICT (content): Merge conflict in
body: <p>I have a server with a remote and whenever I <code>git pull</code> I get those stupid ====== and HEAD >>>> things in my files causing my server to not work properly. How can I prevent this every time I want to update my server to be the same as my origin/master?</p>
  
  <p>This is what I did:</p>
  
  <pre><code>git pull production master
  </code></pre>
  
  <p>Then I got this:</p>
  
  <pre><code>CONFLICT (content): Merge conflict in 
  </code></pre>
  
  <p>When I do a <code>git status</code> I get this:</p>
  
  <pre><code>Unmerged paths:
  (use "git add/rm &lt;file&gt;..." as appropriate to mark resolution)
  
      both modified:      photocomp/settings.py
      both modified:      photocomp/wsgi.py
  </code></pre>