如何做git cherry-pick - 在SourceTree中继续？ [英] How to do git cherry-pick --continue in SourceTree?

问题描述

在解决问题后，如何继续使用SourceTree进行樱桃采摘。
如果我正在进行rebase并发生冲突，那么在解决这些冲突后，当我单击commit时，SourceTree会让我继续这个rebase。但如何继续樱桃挑选操作？

How do I continue cherry picking using SourceTree after I resolved confilcts. 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 有效将提交A中的更改应用到工作树上并进行提交。这意味着如果你在> cherry-pick ing过程中遇到任何冲突，你只需要在解析完成 commit code> cherry-pick 。

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.

编辑 code> cherry-pick 一次提交。当选择多个提交时，您可以从控制台运行 git cherry-pick -continue 。我不确定您是否可以通过SourceTree直接执行此操作。

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.

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