解决git push错误：failed to push some

git pull --rebase origin branch-name  //branch-name为分支名

git push origin branch-name

参考链接：https://my.oschina.net/wangbaofeng/blog/881127