Skip to content

Commit 89549c3

Browse files
authored
Merge pull request #782 from kenjis/update-RELEASE.md
docs: update RELEASE.md
2 parents 2d0ec09 + c0e067d commit 89549c3

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

admin/RELEASE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,17 @@ the changelog.
7171
* Watch for the "docs" action and verify that the user guide updated:
7272
* [docs](https://github.com/codeigniter4/shield/actions/workflows/docs.yml)
7373
* Fast-forward `develop` branch to catch the merge commit from `master`
74-
(note: pushing to develop is restricted to administrators):
74+
(note: pushing to `develop` is restricted to administrators):
7575
```console
7676
git fetch origin
7777
git checkout develop
7878
git merge origin/develop
7979
git merge origin/master
8080
git push origin HEAD # Only administrators can push to the protected branch.
8181
```
82+
**At this point, `master` must be merged into `develop`.** Otherwise, the
83+
GitHub-generated release note from `develop` for the next release will not be
84+
generated correctly.
8285
* Publish any Security Advisories that were resolved from private forks
8386
(note: publishing is restricted to administrators)
8487
* Announce the release on the forums and Slack channel

0 commit comments

Comments
 (0)