title: How to find conflicts in a pull request
body: <p>Recently i forked a repository and did some commits to my new repository. Then i have done a pull request to merge with the original repository but there are some conflicts and they can't automerge. The person who manages the original repository told me to find out how to fix this conflicts but i cannot get any info about the conflicts in the github web interface. What would be the best way to do it?</p>
  
  <p>As a note: since i forked there has been three minor commits in the original repository but also one i think is the problem: a file has been deleted (myfile-v4.js) and another added (myfile-v5.js), they are clearly the same file with some modifications but the name changed for versioning. One of my commits changed myfile-v4.js.</p>
  
  <p>Thanks in advance</p>