使用源树，在冲突中变基，在冲突解决后变基不起作用 [英] Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

问题描述

我在 Windows 上使用 SourceTree 作为我的 git 工具.

I'm using SourceTree as my git tool on Windows.

我有一个 main 分支和一个 feature 分支，但是当我遇到冲突时，我无法让 SourceTree 执行变基.

I have a main branch and a feature branch and I can't get SourceTree to perform a rebase when I have a conflict.

main 看起来像:

c1 -> c2 -> c4 -> c5

c1 -> c2 -> c4 -> c5

功能看起来像:

c1-> c2 -> c3

c1-> c2 -> c3

我想重新调整功能，所以它是:

I want to rebase feature so it will be:

c1 -> c2-> c4-> c5-> c3

c1 -> c2-> c4-> c5-> c3

c3 和 c5 之间存在冲突.我可以解决冲突，但是当我提交更改时，我会得到一个 HEAD 标记并查看我的图表，我可以看到 feature 分支没有重新定位.

There is a conflict between c3 and c5. I can resolve the conflict, but when I commit the changes I get a HEAD tag and looking at my graph I can see that feature branch wasn't rebased.

如何让 rebase 工作?

How can I get the rebase to work?

推荐答案

不幸的是，atlassian-sourcetree.

解决冲突并在暂存区进行所有更改后，不要点击提交，而是转到操作-> 继续重新定位:

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:

这篇关于使用源树，在冲突中变基，在冲突解决后变基不起作用的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！