Git pull - can't submit merge message [duplicate]
This question already has answers here: Closed 9 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://example.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.
This is vim, it's a common unix editor
press:
:wq
that's it. (w=write q=quit)
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 :)
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How to remove local (untracked) files from the current Git working tree
- How do I resolve merge conflicts in a Git repository?
- What is the difference between 'git pull' and 'git fetch'?
- How do I undo 'git add' before commit?
- How do I force "git pull" to overwrite local files?
- How do I check out a remote Git branch?
- How do I delete a Git branch locally and remotely?
- Undo a Git merge that hasn't been pushed yet
- How do I rename a local Git branch?
