如何在 SourceTree 中执行 git cherry-pick --continue？
声明：本页面是StackOverFlow热门问题的中英对照翻译，遵循CC BY-SA 4.0协议，如果您需要使用它，必须同样遵循CC BY-SA许可，注明原文地址和作者信息，同时你必须将它归于原作者（不是我）：StackOverFlow
原文地址: http://stackoverflow.com/questions/25306597/
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
How to do git cherry-pick --continue in SourceTree?
提问by szym
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?
解决冲突后如何继续使用 SourceTree 采摘樱桃。如果我正在执行 rebase 并且遇到冲突，那么在单击 commit 时解决它们后 SourceTree 让我继续该 rebase。但是如何继续樱桃采摘操作呢？
回答by Sascha Wolf
cherry-pickeffectively 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 commitafter resolving them to finish the cherry-pick.
cherry-pick有效地将提交 A 的更改应用到工作树上并进行提交。这意味着如果您在cherry-picking期间遇到任何冲突，您只需要commit在解决它们后完成cherry-pick.
EDITEdward noted that this is only true when you are cherry-picking a single commit. When picking multiple commits you can run git cherry-pick --continuefrom the console. I'm not sure if you can do this directly via SourceTree.
编辑爱德华指出，这仅在您进行cherry-pick单次提交时才是正确的。选择多个提交时，您可以git cherry-pick --continue从控制台运行。我不确定您是否可以通过 SourceTree 直接执行此操作。
回答by Bowofola
Create a custom action as such
创建一个自定义操作
git cherry-pick --continue --no-edit
回答by Maryadi Poipo
I'm not mistaken (I'm not so sure if this a cherry pick) in source tree we just have to right click the commit history on Source Tree and then Merge. Details can be found here : https://www.youtube.com/watch?v=CMj3mXFOamc&feature=youtu.be
我没有弄错（我不太确定这是否是一个樱桃选择）在源树中我们只需要右键单击源树上的提交历史，然后合并。详细信息可以在这里找到：https: //www.youtube.com/watch?v=CMj3mXFOamc&feature=youtu.be
