Merge branch 'master' of xxx error

Merge branch 'master' of xxx

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.

只需  shift + ! 输入  wq  

问题的意思是:请解释为什么合并代码   shift + !  进入编辑状态    wq   保存退出

原文地址:https://www.cnblogs.com/linliquan/p/10611510.html