使用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.
话不多说,直接描述方法: