git 提交的时候出现错误提示
fatal: cannot do a partial commit during a merge.```
The local repository is out of date.Make sure all changes have been pulled from the remote repository and try again.```
执行
git pull <远程主机名> <远程分支名>:<本地分支名>
git pull --rebase xxx master
- xxx 是Add Remote的Name 默认为origin
- master 是你的分支名称 默认是master
