Skip to content

Commit

Permalink
Clarify manual merging of PR in release doc (#23928)
Browse files Browse the repository at this point in the history
It was not clear to me what this really means
  • Loading branch information
ephraimbuddy committed May 26, 2022
1 parent 6bbe015 commit bfe51ea
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion dev/README_RELEASE_AIRFLOW.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit bfe51ea

Please sign in to comment.