Gitlab: Sorry, we cannot cherry-pick this merge request automatically

gitlab git-cherry-pick
Mike picture Mike · Apr 5, 2018 · Viewed 13.1k times · Source

I got following error in the Gitlab:

Sorry, we cannot cherry-pick this merge request automatically. This merge request may already have been cherry picked, or a more recent commit may have updated some of its content.

I have branch X from which I have to cherry pick commits to the branch Y. Maybe I have already done cherry pick, which is after this failed cherry pick. I have about 10 cherry picks to do.

What I should to do?

I was thinking if I create new branch Z (before Y) and try add cherry picks in the right order. Maybe that would be solution? What you think?

Answer

Mike picture Mike · Oct 4, 2018

I did the cherry picks so that I picked up the merge request commits with commands like this:

git cherry-pick -m 1 <merge request commit hash 1>
git cherry-pick -m 1 <merge request commit hash 2>
...
git cherry-pick -m 1 <merge request commit hash N>

The -m 1 parameter is a little bit cryptical in the documentation, but I have done a lot of cherry picks and this is working.

Related questions

GitLab remote: HTTP Basic: Access denied and fatal Authentication

I am on mac OS unlike this post: 'git push origin MyBranchName' throws error "HTTP Basic: Access denied" I have password configured in GitLab. I have SSL key created AFTER the project was made on GitLab. When I use an …

Read More
server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none

I can push by clone project using ssh, but it doesn't work when I clone project with https. The error message that shows me is: server certificate verification failed. CAfile: /etc/ssl/certs/cacertificates.crt CRLfile: none

Read More
How to remove a Gitlab project?

I have created several repositories in GitLab. One of those was for testing purposes and has some commits and branches. I want to delete or remove this repository. How can I do this?

Read More