git pull 报Your branch and 'origin/master' have diverged

背景

经理建立仓库, 并第一次提交.
tomclone并添加文件. push不上去, 合并(pull)时报历史不一致问题.

问题

git status发现:
Your branch and 'origin/master' have diverged

解决

// tom的命令行
git fetch
git reset --hard origin/master    // 回退到最初状态git reflog
// 经理的命令行
git reflog// 可以发现两者现在的版本号一致了.

经过上述操作, 应该就是将两个用户的历史记录统一了. 多用户协同开发, 应该保证每个用户的提交记录一样(个人理解), 否则就会出现分支不一致, push不上去的问题.

除了上述解决办法外, 还有简单粗暴的做法, 但是个人不建议.
当提示分歧时会提示, 需要先git pull, 即将远程与本地合并, 但是这样会出现历史记录不一致问题. 这时可以用以下命令, 强行合并(忽略不相关历史).

pull origin master --allow-unrelated-histories

这样, 应该是会丢失当期那分支的历史记录.

git pull 报Your branch and 'origin/master' have diverged相关推荐

git提交出现Your branch and ‘origin/master‘ have diverged解决方法
取消修改,只要执行下面两步: git fetch origin git reset --hard origin/master 当我们在本地提需要交到远程仓库的时候使用如下命令: 1.git rebas ...
Your branch and 'origin/master' have diverged
背景经理建立仓库, 并第一次提交. tomclone并添加文件. push不上去, 合并(pull)时报历史不一致问题. 问题 git status发现: Your branch and 'orig ...
git使用问题之Your branch and 'origin/master' have diverged
1.问题描述: 在我们pull代码时,有时候会意外的在vim上出现如下提示(其实就是pull失败了) " Your branch and 'origin/master' have diver ...
git出现Your branch and ‘origin/master‘ have diverged解决方法
git出现Your branch and 'origin/master' have diverged解决方法参考文章: (1)git出现Your branch and 'origin/master' ...
Your branch and ‘origin/master‘ have diverged,and have 1 and 353 different commits each, respective
今天打开以前的一个项目,其他同事在维护,自己想更新下最新代码,然后执行拉取了下,竟然报错了: git pull origin masterFrom ssh://test.com:1198/~test/ ...
Your branch and ‘origin/master‘ have diverged,
问题: On branch master Your branch and 'origin/master' have diverged, and have 4 and 10 different comm ...
git问题：Your branch and 'origin/zq-dev' have diverged,and have 1 and 1 different commits each？如何解决
git:出现Your branch and 'origin/zq-dev' have diverged,and have 1 and 1 different commits each, respect ...
Your branch and 'origin/master' have diverged, and have # and # different commits each, respectively
一．如标题,当git有如上提醒时,意思是需要rebase或者merge了,具体情况如下: When you have a message like: "Your branch and 'or ...
Your branch and ‘origin/master‘ have diverged
开发中遇到拉取最新远程仓库代码的时候就出现下面错误,说我的本地和远程不一致. Your branch and 'origin/master' have diverged, and have 1 and ...

git pull 报Your branch and 'origin/master' have diverged

背景

问题

解决

git pull 报Your branch and 'origin/master' have diverged相关推荐

最新文章

热门文章