解决git提交：Please enter a commit message to explain why this merge is necessary