开发中遇到拉取最新远程仓库代码的时候就出现下面错误，说我的本地和远程不一致。
1 Your branch and 'origin/master' have diverged, 2 and have 1 and 4 different commits each, respectively. 3 (use "git pull" to merge the remote branch into yours)
网上搜索处理结果，执行命令如下（注意了，操作会覆盖本地的修改，建议手动备份本地代码再执行命令。）：
1 git fetch origin 2 git reset --hard origin/master
标签：origin,git,master,branch,diverged,Your From： https://www.cnblogs.com/sjiatong/p/16995972.html