github locks up mac terminal when using pull command

Question

I\'m in the process of learning github on mac (command-line) and whenever I do git pull origin master i get this

# Please enter a commit message         


        

Answer 1

I fixed this problem by executing following steps

1. Remove #MERGE_MSG#

   rm .git/\#MERGE_MSG#

2. Remove MERGE_HEAD

   rm .git/MERGE_HEAD

Additionally, I explicitly set git's editor to an editor that I am familiar with vim (you can set nano)

`git config --global core.editor "vim"`