Your branch and 'origin/master' have diverged, and have 1 and 1 different commits each, respectively

报错信息：

Your branch and 'origin/master' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

解决方法：

1、           git rebase origin/master 

2、           git pull --rebase 

3、           git push origin master  

 

---

备注：

        关于 git merge 和 git rebase   详见:   https://blog.csdn.net/wh_19910525/article/details/7554489   或则点 git merge 和 git rebase 。

---

        git push origin master -f  强行让本地分支覆盖远程分支