Menu
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?
317
This means if you get any conflicts during cherry-pick ing you need to commit after resolving them to finish the cherry-pick . EDIT Edward noted that this is only true when you are cherry-pick ing a single commit. When picking multiple commits you can run git cherry-pick --continue from the console.
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.
73
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
