The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

How do you resume a cherry pick

Mike Colls
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

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 Champions.
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
TAGS
AUG Leaders

Atlassian Community Events