title: GitHub "can't automatically merge"?
body: <p>Sometimes when i try to merge the head fork into my base fork, or my base fork into the head fork, I get the following message on GitHub: </p>
  
  <blockquote>
    <p>"Can’t automatically merge. Don’t worry, you can still create the pull request." </p>
  </blockquote>
  
  <p>How do I view the conflicts, if there are any for this?</p>
  
  <p>I have read about 10 different examples with various commands but I can't tell what the names in the examples apply to in my situation as different names for bases, forks, branches, etc, exist.</p>
  
  <p>After all of this, I can't believe there isn't a command you can type to see the conflicts, edit the conflicts and go on with merging. 
  If there is, I haven't found it yet.</p>