This is an automated email from the ASF dual-hosted git repository.
ephraimanierobi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new bfe51ea64a Clarify manual merging of PR in release doc (#23928)
bfe51ea64a is described below
commit bfe51ea64a6957587c33baf32916b205dea91a45
Author: Ephraim Anierobi <splendidzig...@gmail.com>
AuthorDate: Thu May 26 15:52:10 2022 +0100
Clarify manual merging of PR in release doc (#23928)
It was not clear to me what this really means
---
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 ebe94e6abb..6c050ebd4a 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
