title: Github Merge issue (all lines shown)
body: <p>I'm trying to merge two of my branches and while trying to resolve the conflicts I can usually just open up the file and github has added</p>
  
  <pre><code>"&gt;&gt;&gt;&gt;HEAD
   {my code}
   ========
   {other code}
   &gt;&gt;&gt;&gt;Other"
  </code></pre>
  
  <p>this shows me which specific lines of code are different in the two versions and then I can decide which lines to keep. However, when I'm merging some of the PHP files don't show the exact differences. Instead the PHP file has my version on top with all the lines included and the other version on bottom. It's a lot harder trying to resolve conflicts this way. Are there any suggestions as to why this is happening? How can I resolve my conflicts in an easier way?</p>