title: How to merge a branch and get conflict markers in GitHub for Windows or web
body: <p>I am using GitHub on the web and with the Windows client, and I'm having trouble merging a branch into a master repo. I've created a pull request and get the message:</p>
  
  <blockquote>
    <p>We can't automatically merge this pull request.
    Use the command line to resolve conflicts before continuing.</p>
  </blockquote>
  
  <p>GitHub provides some command line examples, but they don't work for me (possible due to a proxy issue, which is another/off-topic issue). I'm wondering: <strong>How can I get a merged file with <em>conflict markers</em> using either the web or the Windows client?</strong></p>
  
  <p>This seems possible using the Mac client (see <a href="https://help.github.com/articles/resolving-merge-conflicts/" rel="nofollow noreferrer">https://help.github.com/articles/resolving-merge-conflicts/</a>), and it seems to be possible if you are syncing in the same branch with the Windows client (see  <a href="https://stackoverflow.com/questions/13210706/github-conflict-resolving">GITHUB Conflict Resolving</a>), but I haven't figured out how to do it between a branch and the master.</p>
  
  <p>Note: If this is completely impossible without using the command line, I'll accept an answer that explains how that might be done. The goal is to have a solution that is user-friendly enough so it can be passed on to my group and organization.</p>