使用源代码树，发生冲突时重新设置基准，解决冲突后重新建立功能不起作用 [英] Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled

问题描述

我正在使用 SourceTree 作为Windows上的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.

主要如下:

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.

我如何才能使基准工作?

How can I get the rebase to work?

推荐答案

不幸的是，在在解决冲突并将所有更改都保留在暂存区中之后，不必单击 commit ，而是转到 Actions -> Continue Rebase :

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屋！