Forums
Home Product Q&A Discussion groups Articles Ask a question Search
Learning
Events
Champions

Forums

Articles
Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Product Q&A
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Events
Community resources

How do you resume a cherry pick

Mike Colls
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!
Get involved
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?

Answer
Watch
Like Be the first to like this
6713 views

1 answer

0 votes
Balázs Szakmáry
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.
Get recognized
May 12, 2015

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

View More Comments
Joe Pallas
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.

Like
Joe Pallas
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
Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

    See all events
    Community
    Forums
    FAQs Forums guidelines
    Learning
    About learning Resources
    Events
    Champions
    Copyright © 2025 Atlassian
    Privacy Policy Terms Security
    Welcome illustration

    Welcome to the new Atlassian Community

    Online forums and learning are now in one easy-to-use experience.

    By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.