如何在 SourceTree 中执行 git cherry-pick --continue? [英] How to do git cherry-pick --continue in SourceTree?

问题描述

在解决冲突后，如何使用 SourceTree 继续挑选樱桃?

如果我正在执行变基并且遇到冲突，那么在我单击提交时解决它们之后 SourceTree 让我继续该变基.但如何继续樱桃采摘操作?

解决方案

cherry-pick 有效地将提交 A 的更改应用到工作树并进行提交.这意味着如果您在 cherry-pick 过程中遇到任何冲突，您只需要在解决它们后 commit 以完成 cherry-pick.

编辑 Edward 指出，这仅在您cherry-pick进行单个提交时才是正确的.选择多个提交时，您可以从控制台运行 git cherry-pick --continue.我不确定您是否可以通过 SourceTree 直接执行此操作.

How do I continue cherry picking using SourceTree after I resolved conflicts?

If I am doing rebase and I get conflicts then after resolving them when I click commit SourceTree lets me continue that rebase. But how to continue cherry pick operation?

解决方案

cherry-pick effectively applies the changes from commit A onto the working tree and makes a commit. This means if you get any conflicts during cherry-picking you just need to commit after resolving them to finish the cherry-pick.

EDIT Edward noted that this is only true when you are cherry-picking a single commit. When picking multiple commits you can run git cherry-pick --continue from the console. I'm not sure if you can do this directly via SourceTree.

这篇关于如何在 SourceTree 中执行 git cherry-pick --continue?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！