Error Message "You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can merge." Undo the merge and pull again. To undo a merge:
git merge --abort[Since git version 1.7.4]
git reset --merge[prior git versions] Resolve the conflict. Don't forget to add and commit the merge.
git pullnow should work fine.
How to refresh the list of remote branches in git git remote update origin --prune git branch -a