title: Avoiding merge conflicts with git
body: <p>I've been using git for a while, and I understand why merge conflicts happen and that I need to make the final decision between two conflicting blocks of code.</p>
  
  <p>However, I want to find a way to fix merge conflicts without git modifying the conflicting files.  For example, if there are merge conflicts in a Django template or HTML file when I pull from dev into prod, the conflict lines go live on my site.</p>
  
  <p>In most cases, merging is not actually what I want for a lot of HTML content I have.  I usually prefer only one version of the two conflicting files.</p>
  
  <p>Is there a way to achieve this? </p>