Git pull - unable to send merge message

Question

Possible duplicate:
github blocks mac terminal when using pull command

I am using git via terminal on mac. I recently ran into an annoying problem when trying to execute git pull . After running git pull , the following error message appears:

 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 problem is that I cannot enter anything. My terminal seems to be stuck and there is nothing I can do about it. I am new to git, so this may be a simple mistake I am making.

I read here that for some people a text editor opens at this moment. This, of course, is not at my end. It also states that I can use the -no-edit flag to merge without a message, but even this doesn't seem to work at my end.

Right now I'm a little clueless, stuck and unable to push any changes to my server; -)

Thanks so much for the help provided!

Answer 1

This is vim, this is a regular unix editor.

click:

 :wq 

what he. (w = write q = quit)

Answer 2

When you see this, the editor is already open because you see it;) I assume that it opens vi or its derivative. Google 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 :)