git 提交报错 cannot do a partial commit during a merge

git 提交报错 cannot do a partial commit during a merge 在提交代码时，有时会遇到这样的问题。其实是合并代码时，你可能遇到有代码 ...