深入理解git分支分叉(branch diverged)的问题

翻译 2015年02月27日 17:47:14

问:

I googled and read many posts, but none could make me understand the branch divergence problem yet.

If I've remote tracking branch, I often get into the following:

$ git status
# On branch feature/worker-interface
# Your branch and 'origin/feature/worker-interface' have diverged,
# and have 1 and 4 different commit(s) each, respectively.
答:

First, you can use the cherry command to see what commits differ between branches, and in what ways. So in this case, running g cherry origin/feature/worker-interface shows us the status of commits on the current branch and how they stack up against origin/feature/worker-interface. You will find 1 repo which you forgot to commit.

首先,你可以使用git cherry命令查看提交的分支的不同,也就是说你可以git cherry origin/master 查看,显示在当前分支origin/master下提交的状态,你将发现有1个版本库你忘记了提交。

Now, lets see whats happening with the 'origin/feature/worker-interface' and its commits.For this we can run a log command with a special format gl ..origin/feature/worker-interface --oneline

现在,让我们看看origin/master到底发生了什么情况,我们用git log ..origin/master --online 查看。

Here we see 4 commits that don't exist in our current branch

我们发现有4个提交在我们的当前分支下不存在。

So now we have a good idea of what’s happened. you’ve made 1 commits on your local master branch, and it looks like there are 4 commits on origin/feature/worker-interface which you don’t have merged in yet. So, you could just blindly merge things together and go on your way (if they merge without conflict), but I’d like to show you how to deal with it in a more controlled manner.

所以我们很想知道这到底是什么原因导致了这种情况的发生。你在本地的master分支提交了一次,但是看上去应该是四次提交,这四次提交你都还没有进行合并过。那么,你可能盲目的把它们进行合并,但我将告诉你这应该怎么更好的处理这个问题:

1) First, create a branch that points to your current HEAD: gco -b local_changes 2) Now that we have that to keep track of those changes, we switch back to feature/worker-interface: gco feature/worker-interface 3) At this point, reset the feature/worker-interface branch to get rid of the 1 commit. 4) There you go! You can check your status of branch git status you will be prompted asnothing to commit


1),你应该创建一个分支指向你当前的HEAD ,如果有分支可以不用创建(git checkout -b local_changes)

2) 现在我们可以追踪到分支上的变化,我们切回到origin/master ,git checkout origin/master

3)之后git reset origin/master 删除origin/master 分支上的一次提交

4)OK,完工。git status查看下。

参考:http://stackoverflow.com/questions/9189413/good-and-clear-understanding-of-the-git-branches-diverged-issue

相关文章推荐

git 问题之解决

错误

Git - Your branch and 'origin/xxx' have diverged

Git fetch、merge上游代码后执行git status提示Your branch and 'origin/xxx' have diverged

[小技巧] 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 'XXX' have diverged

目前没什么好办法,我的做法是新建一条branch,删掉这条有问题的branch。。(这份code最好保存一份)...

Git使用总结!

情景1:如何多人协作? 假若你已经clone了别人的仓库并且需要修改,最好的办法是建立自己的分支然后在合并,具体步骤如下: 1.建立一个自己的分支 git branch mybranch 此时...

Git 的origin和master分析

Git 的origin和master分析  http://lishicongli.blog.163.com/blog/static/1468259020132125247302/   首先...

Git入门指南十一:Git branch 分支与合并分支

十五. Git branch 分支 查看当前有哪些branch bixiaopeng@bixiaopengtekiMacBook-Pro xmrobotium$ git branch * maste...

【Git学习笔记】Bug分支——创建branch切换checkout

经常遇到的情况是,在开发新feature1的时候,遇到了bug。

git branch用法总结

git branch       git branch 不带参数:列出本地已经存在的分支,并且在当前分支的前面加“*”号标记,例如:    #git branch * master    ...

git分支branch详解

上一篇git的基本原理http://blog.csdn.net/xiaoputao0903/article/details/23912561,介绍了git最基本的原理和相关操作,这篇就来讲讲git的分...
内容举报
返回顶部
收藏助手
不良信息举报
您举报文章:深入理解git分支分叉(branch diverged)的问题
举报原因:
原因补充:

(最多只允许输入30个字)