github在使用pull命令时锁定mac终端 [英] github locks up mac terminal when using pull command

问题描述

我正在 mac 上学习 github(命令行)，每当我做 git pull origin master 我都明白这个

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 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.
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
~                                                                               
".git/MERGE_MSG" 7L, 293C

终端似乎锁定并且不允许我立即输入任何内容，然后当它最终允许我输入文本时，它似乎无法识别 git 命令.

the terminal seems to lock up and doesn't allow me to enter anything immediately, then when it finally does allow me to enter text it seems like it doesn't recognize git commands.

这是 git 中的错误还是我遗漏了什么?

Is this a bug in git or am i missing something?

推荐答案

你在文本编辑器中，vim！这是一个模态文本编辑器，因此您需要:

You're in the text editor, vim! It's a modal text editor, so you would need to:

1. 按i进入插入模式.
2. 现在您可以输入您的消息，就像您在正常(非模态)文本编辑器.
3. 按 esc 返回命令模式.
4. 然后输入:w，然后回车保存.
5. 最后:q，然后输入退出.

1. Press i to enter insert mode.
2. Now you can type your message, as if you were in a normal (non-modal) text editor.
3. Press esc to go back to command mode.
4. Then type :w followed by enter to save.
5. Finally :q followed by enter to quit.

这篇关于github在使用pull命令时锁定mac终端的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！