title: Git says "Automatic merge failed", what does it mean?
body: <p><strong>I tried to merge two branches and this is what i did and what happened:</strong></p>
  
  <pre><code>Abdulla (Master) new-git-project1
  $ git merge sidebar
  Auto-merging index.html
  CONFLICT (content): Merge conflict in index.html
  Automatic merge failed; fix conflicts and then commit the result.
  Abdulla (Master *+|MERGING) new-git-project1
  $ git merge sidebar
  error: Merging 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><strong>i am new to this so can i get simple answers.</strong></p>