Cherry-pick changes

WVS implements Git’s powerful feature to cherry-pick any commit with a Cherry-pick button in merge requests and commit details.

Cherry-pick a merge request

After the merge request has been merged, a Cherry-pick button displays to cherry-pick the changes introduced by that merge request.

After you click that button, a modal displays a branch filter search box where you can choose to either:

  • Cherry-pick the changes directly into the selected branch.
  • Create a new merge request with the cherry-picked changes.

Track a cherry-pick

When you cherry-pick a merge commit, WVS displays a system note to the related merge request thread. It crosslinks the new commit and the existing merge request.

Cherry-pick a commit

You can cherry-pick a commit from the commit details page:

Similar to cherry-picking a merge request, you can cherry-pick the changes directly into the target branch or create a new merge request to cherry-pick the changes.

When cherry-picking merge commits, the mainline is always the first parent. If you want to use a different mainline, you need to do that from the command line.

Here’s a quick example to cherry-pick a merge commit using the second parent as the mainline: 

git cherry-pick -m 2 7a39eb0

Cherry-pick into a project

You can cherry-pick merge requests from the same project, or forks of the same project, from the WVS user interface:

  1. In the merge request’s secondary menu, click Commits to display the commit details page.
  2. Click on the Options dropdown and select Cherry-pick to show the cherry-pick modal.
  3. In Pick into project and Pick into branch, select the destination project and branch:
  4. Optional. Select Start a new merge request if you’re ready to create a merge request.
  5. Click Cherry-pick.

Troubleshooting

For additional information and support, please reach out to us on our Discord or by Email.