nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Sourcetree cherry pick error

Fred Wood

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?

Accepted answers

Balázs Szakmáry

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.

All comments

Fred Wood

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

Balázs Szakmáry

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.

Fred Wood

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?

Balázs Szakmáry

"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).

modrallm

Still not fixed, apparently.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

commit