问题1：
# 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
解决办法：
You‘re in the text editor, vim! It‘s a modal text editor, so you would need to:
:w followed by enter to save.:q followed by enter to quit.原文：http://www.cnblogs.com/fangchun/p/4700833.html