Python 如何合并远程跟踪分支&x27;caffe/master';你的头?

Python 如何合并远程跟踪分支&x27;caffe/master';你的头?,python,git,github,cpu,Python,Git,Github,Cpu,我使用的是无CPU的Ubuntu 14.04,我想运行以下代码:, 在步骤1中,如果我执行了git merge-X他们的caffe/masterhe打印: Merge remote-tracking branch 'caffe/master' into HEAD # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream

我使用的是无CPU的Ubuntu 14.04,我想运行以下代码:, 在步骤1中,如果我执行了
git merge-X他们的caffe/master
he打印:

Merge remote-tracking branch 'caffe/master' into HEAD

# 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.
GNU nano 2.2.6文件:/home/brm17/Desktop/py faster rcnn/.git/modules/caffe fast rcnn/MERGE_MSG

Merge remote-tracking branch 'caffe/master' into HEAD

# 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.

我该怎么办?

这是打开的编辑器,您可以编写提交消息。这意味着合并进展顺利,没有冲突。只需设置注释、保存文件并退出,就可以进行合并修订。

我该怎么办??我只保存吗?是的,只需在顶部设置正确的注释,保存并退出即可
Merge remote-tracking branch 'caffe/master' into HEAD

# 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.