Your branch and ‘origin/master‘ have diverged

开发中遇到拉取最新远程仓库代码的时候就出现下面错误，说我的本地和远程不一致。

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

网上搜索处理结果，执行命令如下（注意了，操作会覆盖本地的修改，建议手动备份本地代码再执行命令。）：

git fetch origin
git reset --hard origin/master