Managing Cherry-Picks
Last updated
Last updated
Cherry-picking enables you to apply specific commits from one branch to another without merging the entire branch. In Aviator’s release management system, cherry-picks are used to selectively integrate changes into release candidates. This guide will walk you through the process of managing cherry-picks in Aviator, ensuring smooth handling of your release process.
Before you begin cherry-picking, ensure that your repository is properly connected to Aviator and that a release project has been created. Refer the guide here to know more about release projects.
Set up your repository and connect it to Aviator.
Create a release project if it does not already exist.
Open Aviator’s Release Dashboard.
Cut a release from the listed PRs on the dashboard.
Note: You can skip this step if you already have an existing release to base the cherry-pick on, as this is the release where you will apply the cherry-pick.
Find the specific PR you wish to cherry-pick into your release.
Click on the PR to open the detailed view.
Click the "Cherry-pick" button in the PR details view.
Click the button to initiate the cherry-pick process. Aviator will apply the changes from the PR into the selected release candidate in the dropdown. It may take a few seconds to apply the cherry-pick.
Aviator enables users to apply the same PR to multiple release candidates. You can select the oldest release version, and Aviator will apply the cherry-pick to all versions newer than that.
Users can also deselect the versions they don't want to apply cherry-picks to. Aviator will automatically detect which versions already include this PR and skip the cherry-pick for those versions.
During the cherry-pick process, Aviator will display the current status of the operation. It may take a few seconds for the cherry-pick to be applied, and the status will indicate the progress:
In Progress: The cherry-pick is still in progress.
Success: The cherry-pick has been successfully applied, and a new release candidate has been created.
Failure: The cherry-pick failed due to confliects, and Aviator will create a draft PR to resolve the issue.
If the cherry-pick is successful, a second release candidate of the release will be created.
In some cases, a cherry-pick may fail due to conflicts between the changes in the PR and the current state of the release branch. Aviator will flag such conflicts and provide tools to help resolve them. To learn how to resolve cherry-pick failures, refer to the detailed guide on Resolving Cherry-Pick Failures.
