From 3fe8430d87709529badad6cb7d28bd39024cf1ac Mon Sep 17 00:00:00 2001 From: Ephraim Anierobi Date: Thu, 26 May 2022 15:52:10 +0100 Subject: [PATCH] Clarify manual merging of PR in release doc (#23928) It was not clear to me what this really means (cherry picked from commit bfe51ea64a6957587c33baf32916b205dea91a45) GitOrigin-RevId: 16fc9d99d2c3b33687fc0d786fe385a15ad70aef --- dev/README_RELEASE_AIRFLOW.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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