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

You can do git checkout --merge yourbranch

A three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch.