问题
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?
回答1:
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.
回答2:
Create a custom action as such
git cherry-pick --continue --no-edit
回答3:
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://stackoverflow.com/questions/25306597/how-to-do-git-cherry-pick-continue-in-sourcetree