Skip to content
GitLab
Next
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    Projects Groups Snippets
  • Sign up now
  • Login
  • Sign in / Register
  • GitLab GitLab
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 46,704
    • Issues 46,704
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 1,536
    • Merge requests 1,536
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Artifacts
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.orgGitLab.org
  • GitLabGitLab
  • Issues
  • #21268
Closed
Open
Issue created Feb 23, 2018 by Kim Carlbäcker@bkc

Cherry pick commits from fork to parent

Problem

Currently if a user wants to cherry pick a single commit from a fork, they would have to download the .patch-file for it and do it manually.

Proposal

  • Given I am a member of the parent project
  • And I am looking at a commit in a downstream fork
  • When I click the "options" button in the commit
  • Then I will be able to select which project/branch I want to pick into
  • And I will be able to either pick into the parent OR this fork (given I have access to do so)

image

This MVC will include only picking from a downstream fork into an upstream parent, one-way only. MVC assumes the user cherry-picking the commit is a member of the source project.

Links / references

  • &1421
  • &264
  • MR !56121 (merged)
  • Docs MR !56311 (merged)

Customers

  • https://gitlab.my.salesforce.com/0016100000SyUcF

Release Notes

Description: Forking a git repository is a great way to collaborate on public projects where community contributors don't have write access to the parent project. Members of the parent project likewise benefit from community contributions. However, when a fork goes stale or the fork owner cannot be reached, members of the parent project who want to benefit from fork contributions by are left to manually download the fork's .patch file to manually cherry-pick commits or otherwise copy/paste the contribution from the fork.

GitLab 13.11 introduces a new cherry-pick option which allows commits from forked repos to be cherry-picked directly into the parent repo by members of the parent project. A new pick into project section has been added to the cherry-pick dialog, shown when selecting options>>Cherry-pick in the commit details page.

Future enhancements include the ability to cherry-pick commits across the fork network.

Documentation: https://docs.gitlab.com/ee/user/project/merge_requests/cherry_pick_changes.html#cherry-pick-into-a-project

cherry_pick_into_project_v13_11

Edited Apr 20, 2021 by Daniel Gruesso
Assignee
Assign to
Time tracking