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-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. I’m not sure if you can do this directly via SourceTree.