Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Sourcetree cherry pick error

I have tried to cherry pick a commit but it never works, I always get this error message:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree cherry-pick 1ff4d770a1d6316b54b9718a56b36672036d593c
error: Commit 1ff4d770a1d6316b54b9718a56b36672036d593c is a merge but no -m option was given.
fatal: cherry-pick failed
Completed with errors, see above

Any idea what is causing this problem and what I can do to correct it?

2 answers

1 accepted

0 votes
Answer accepted

This is (the lack of) a feature: cherry-picking/reverting merge commits is currently not possible in SourceTree.

I already created an issue about it. Please upvote it here.

Thanks for the reply – I will upvote your issue.

So then what is cherry-picking, and why does SourceTree have a command that does nothing?

"Given one or more existing commits, apply the change each one introduces, recording a new commit for each." (= duplicate a commit to another branch, in most cases)

SourceTree does implement this correctly, but only for commits which are not merge commits (= commits with multiple parents in the graph).

Still not fixed, apparently.

Can anyone shed light on this? I don't understand what is wrong.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Calling any interview participants for Bitbucket Data Center

Hi everyone,  We are looking to learn more about development teams’ workflows and pain points, especially around DevOps, integrations, administration, scale, security, and the related challeng...

441 views 4 4
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you