Having errors during attempted recursive merge between two branches in git
<p><a href="http://i.stack.imgur.com/CXKaK.png" rel="nofollow">Having errors during attempted recursive merge between two branches in git</a></p>

<pre><code>Abhinavs-MBP:src Akurada$ git branch --no-merged
  master

Abhinavs-MBP:src Akurada$ git checkout master
Switched to branch 'master'

Abhinavs-MBP:src Akurada$ git branch --no-merged
  add-scoring

Abhinavs-MBP:src Akurada$ git merge add-scoring
error: There was a problem with the editor 'vi'.
Not committing merge; use 'git commit' to complete the merge.

Abhinavs-MBP:src Akurada$ git merge add-scoring
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you merge.
</code></pre>