git 使用源树，在冲突中变基，在冲突解决后变基不起作用
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/25887799/
Warning: these are provided under cc-by-sa 4.0 license. You are free to use/share it, But you must attribute it to the original authors (not me):
StackOverFlow
Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled
提问by Philip Pittle
I'm using SourceTreeas my git tool on Windows.
我在 Windows 上使用SourceTree作为我的 git 工具。
I have a mainbranch and a featurebranch and I can't get SourceTree to perform a rebase when I have a conflict.
我有一个主分支和一个功能分支，当我遇到冲突时，我无法让 SourceTree 执行变基。
mainlooks like:
主要看起来像：
c1 -> c2 -> c4 -> c5
c1 -> c2 -> c4 -> c5
featurelooks like:
功能看起来像：
c1-> c2 -> c3
c1-> c2 -> c3
I want to rebase featureso it will be:
我想重新设置功能，因此它将是：
c1 -> c2-> c4-> c5-> c3
c1 -> c2-> c4-> c5-> c3
There is a conflict between c3and c5. I can resolve the conflict, but when I commit the changes I get a HEADtag and looking at my graph I can see that featurebranch wasn't rebased.
c3和c5之间存在冲突。我可以解决冲突，但是当我提交更改时，我得到了一个HEAD标签，查看我的图表，我可以看到该功能分支没有重新定位。
How can I get the rebase to work?
我怎样才能让 rebase 工作？
回答by Philip Pittle
Unfortunately the UX path for the resolving conflicts during a rebase is quite poor in atlassian-sourcetree.
不幸的是，在atlassian-sourcetree 中，在变基期间解决冲突的 UX 路径非常糟糕。
After you have resolved the conflict and have all of your changes in the staging area, instead of clicking commit, go to Actions-> Continue Rebase:
在您解决冲突并在暂存区域进行所有更改后，不要单击commit，而是转到Actions-> Continue Rebase：
