我的本地分支someNewFeature
错误分歧。Git按顺序合并发散分支
运行git状态,表明这一点:
$ git status
On branch someNewFeature
Your branch and 'origin/someNewFeature' have diverged,
and have 8 and 1 different commit each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
的git的承诺树为当地的分支机构是这样的:
* jjjjjjj commit 10
* iiiiiii commit 9
* hhhhhhh commit 8
* ggggggg commit 7
* fffffff commit 6
* eeeeeee commit 5
* ddddddd commit 4
* ccccccc commit 3
| * bbbbbbb Diverged commit
|/
* aaaaaaa Base commit
我想通过应用所有提交顺序,以解决分歧,即它应该看起来像这样:
* jjjjjjj commit 10
* iiiiiii commit 9
* hhhhhhh commit 8
* ggggggg commit 7
* fffffff commit 6
* eeeeeee commit 5
* ddddddd commit 4
* ccccccc commit 3
* bbbbbbb Diverged commit
* aaaaaaa Base commit
Bo nus:如果你能猜到我可能怎么做到这一点,我会很感激你的洞察力。
你确定提交通过引用'bbbbbbb'采用的是按时间排序的所有其他提交过吗? – Makoto
是的,我是。我今天早上做了这项工作。 – Morgoth
在你做了一些修改(提交'dddd..jjjj')到你本地的'someNewFeature'分支之后,'cccc'是一个由'git pull origin/someNewFeature'产生的合并提交吗? –