Your branch and ‘origin/master‘ have diverged,

问题：

On branch master
Your branch and 'origin/master' have diverged,
and have 4 and 10 different commits each, respectively.(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean

如果不需要保留本地的修改，执行下面两步：

git fetch origin
git reset --hard origin/master

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

git rebase origin/mastergit pull --rebasegit push origin master

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

Your branch and ‘origin/master‘ have diverged,相关推荐

Your branch and 'origin/master' have diverged
背景经理建立仓库, 并第一次提交. tomclone并添加文件. push不上去, 合并(pull)时报历史不一致问题. 问题 git status发现: Your branch and 'orig ...
git pull 报Your branch and 'origin/master' have diverged
背景经理建立仓库, 并第一次提交. tomclone并添加文件. push不上去, 合并(pull)时报历史不一致问题. 问题 git status发现: Your branch and 'ori ...
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 ...
git出现Your branch and ‘origin/master‘ have diverged解决方法
git出现Your branch and 'origin/master' have diverged解决方法参考文章: (1)git出现Your branch and 'origin/master' ...
git使用问题之Your branch and 'origin/master' have diverged
1.问题描述: 在我们pull代码时,有时候会意外的在vim上出现如下提示(其实就是pull失败了) " Your branch and 'origin/master' have diver ...
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
开发中遇到拉取最新远程仓库代码的时候就出现下面错误,说我的本地和远程不一致. Your branch and 'origin/master' have diverged, and have 1 and ...
Your branch and 'origin/master' have diverged, and have 1 and 1 different commits each, respectively
本地工程,上传成github仓库: 1,本地工程文件夹下,git init初始化git $ git init Initialized empty Git repository in D:/AI_cod ...
[小技巧] git: Your branch and 'origin/master' have diverged
本文参考:http://stackoverflow.com/questions/19864934/git-your-branch-and-origin-master-have-diverged-how ...

Your branch and ‘origin/master‘ have diverged,

Your branch and ‘origin/master‘ have diverged,相关推荐

最新文章

热门文章