How do you resume a cherry pick

Mike Colls May 12, 2015

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

0 votes
Balázs Szakmáry
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 12, 2015

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

Joe Pallas October 12, 2015

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.

Joe Pallas March 24, 2016

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

Like Hayden Clark likes this

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events