title: Git merge is not possible because I have unmerged files
body: <p>git continues to confuse me with its unhelpful error warnings This one really deserves a prize:</p>
  
  <pre><code>git merge is not possible because you have unmerged files
  </code></pre>
  
  <p>My situation: My master branch on github was edited (directly in the browser) while my local master branch was also edited.</p>
  
  <p>I wrongly suppose you could simply merge the two versions and be done with it, but also, I cannot merge - because my files are unmerged.</p>
  
  <pre><code>git merge remote/master
  </code></pre>
  
  <p>results in</p>
  
  <pre><code>error: merge is not possible because you have unmerged files.
  hint: Fix them up in the work tree, and then use 'git add/rm &lt;file&gt;'
  hint: as appropriate to mark resolution and make a commit.
  fatal: Exiting because of an unresolved conflict.
  </code></pre>
  
  <p>So, after adding and committing the local change and then trying to merge again, I get:</p>
  
  <pre><code>merge: remote/master - not something we can merge
  </code></pre>
  
  <p>Clearly I am missing something essential here... Do I have the wrong idea about what merging means? How do I fix this issue of having a different remote master / local master branch?</p>