git pull - can't submit merge message

git git-merge git-pull commit-message
Daan picture Daan · Dec 31, 2012 · Viewed 57.3k times · Source

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

Luigi R. Viggiano picture Luigi R. Viggiano · Dec 31, 2012

This is vim, it's a common unix editor

press:

:wq

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

Related questions

Git: How to pull a single file from a server repository in Git?

I am working on a site with a server running Git. I am using Git for deployment (not GitHub). This was set up prior to my involvement using a hook method, and I referred to this question and entered the …

Read More
Is it possible to pull just one file in Git?

I am working on a Git branch that has some broken tests, and I would like to pull (merge changes, not just overwrite) these tests from another branch where they are already fixed. I know I can do git pull …

Read More
Merge, update, and pull Git branches without using checkouts

I work on a project that has 2 branches, A and B. I typically work on branch A, and merge stuff from branch B. For the merging, I would typically do: git merge origin/branchB However, I would also like to …

Read More