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

---

On branch master
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)

当我们在本地提交到远程仓库的时候，如果遇到上述问题，我们可以首先使用如下命令：

git rebase origin/master

然后使用

git pull --rebase

最后使用

git push origin master

把内容提交到远程仓库上。