问题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:
- Press i to enter insert mode.
- Now you can type your message, as if you were in a normal (non-modal) text editor.
- Press esc to go back to command mode.
- Then type
:wfollowed by enter to save. - Finally
:qfollowed by enter to quit.