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
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

649 views 0 4
Read article

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