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

Problems usually happen when we misspell something.
It is more likely this command you are interested in:

git commit -m "message"

if there was a problem, it might say something like

Your branch and 'origin/master' have diverged,
and have 2 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

and use:

git pull

which should lead to:

Already up-to-date.

Then it is good to check:

git status

and try pushing again:

git push