git pull - can't submit merge message [duplicate]

Question

This question already has answers here:

Closed 8 years ago.

Possible Duplicate:
github locks up mac terminal when using pull command

I am using git via the terminal on the mac. I have encountered an annoying problem recently when I try to perform git pull. After performing git pull I receive the following error message:

Merge ssh://domain.com/repository.git
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts:
# the commit.

The issue is that I can't enter anything. My terminal seems stuck and there isn't anything I seem to be able to do about it. I am reasonably new to git so it may be a simple mistake I am making.

I read here that for some people the text editor opens at this point. This certainly isn't the case at my end. It also states there that I can use the --no-edit flag to merge without a message, but even this does not seem to work at my end.

I am a bit clueless at the moment, stuck and unable to push any changes to my server.

Answer 1

This is vim, it's a common unix editor

press:

:wq

that's it. (w=write q=quit)

Answer 2

When you see this, an editor already opened, because you see this ;) I guess it opens vi, or a derivate of this. Google for it to find out how to use it, but it seems you prefer to change the editor instead

git config --global core.editor "emacs"

I prefer nano :)