diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md index ebe94e6abbe..6c050ebd4ab 100644 --- a/dev/README_RELEASE_AIRFLOW.md +++ b/dev/README_RELEASE_AIRFLOW.md @@ -224,7 +224,12 @@ The Release Candidate artifacts we vote upon should be the exact ones we vote ag - Update the `REVISION_HEADS_MAP` at airflow/utils/db.py to include the revision head of the release even if there are no migrations. - Commit the version change. -- PR from the 'test' branch to the 'stable' branch, and manually merge it once approved. +- PR from the 'test' branch to the 'stable' branch, and manually merge it once approved. Here's how to manually merge the PR: + + ```shell script + git merge --ff-only v${VERSION_BRANCH}-test + ``` + - Check out the 'stable' branch ```shell script