最新消息:20190717 VPS服务器:Vultr新加坡,WordPress主题:大前端D8,统一介绍入口:关于

[已解决]git警告:Your branch and have diverged

Git crifan 4390浏览 0评论

licrifandeMacBook-Pro:iOS-Client crifan$ git checkout message_layout

Switched to branch ‘message_layout’

Your branch and ‘origin/message_layout’ have diverged,

and have 2 and 1 different commit each, respectively.

  (use "git pull" to merge the remote branch into yours)

licrifandeMacBook-Pro:iOS-Client crifan$ git status

On branch message_layout

Your branch and ‘origin/message_layout’ have diverged,

and have 3 and 1 different commit each, respectively.

  (use "git pull" to merge the remote branch into yours)

nothing to commit, working directory clean

Your branch and  have diverged

git – master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’? – Stack Overflow

git: Your branch and ‘origin/master’ have diverged – how to throw away local commits? – Stack Overflow

git rebase – git: branches diverged; how to proceed? – Stack Overflow

后来发现此处是正常的:

[总结]git的rebase的完整过程

继续去执行:

<code>git checkout master
git merge message_layout
git push
</code>

即可。

转载请注明:在路上 » [已解决]git警告:Your branch and have diverged

发表我的评论
取消评论

表情

Hi,您需要填写昵称和邮箱!

  • 昵称 (必填)
  • 邮箱 (必填)
  • 网址
62 queries in 0.121 seconds, using 18.82MB memory