How do you resume a cherry pick

Using SourceTree I have just performed a cherry pick and I got a merge issue.  I have used my merge tool to result the issue. I now have uncommited changes on the top of my current trunk.  How do I resume and complete the cherrypick?

1 answer

Press the commit button to commit the merge results. The necessary files should already be staged for you.

When I do this, the usual cherry pick commit message seems to get lost and I have a blank commit message. Not sure if I am doing something wrong.

Correct answer seems to be use the terminal to run git cherry-pick --continue.  SRCTREE-3133 seems to cover this.

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

804 views 10 10
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you