Skip to content

Commit 0715197

Browse files
committed
correct branch name
1 parent 44715d2 commit 0715197

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ This repository currently uses the `develop` branch to reflect active work and `
2929
## Release instructions
3030

3131
1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
32-
1. Changelog: Add/update the changelog in `CHANGELOG.md`.
32+
1. Changelog: Add/update the changelog in `CHANGELOG.md`.
3333
1. Props: update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
3434
1. Readme updates: Make any other readme changes as necessary in `README.md`.
35-
1. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `stable` (`git checkout stable && git merge --no-ff develop`).
36-
1. Push: Push your trunk branch to GitHub (e.g. `git push origin stable`).
35+
1. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then merge `develop` into `stable` (`git checkout stable && git merge --no-ff develop`).
36+
1. Push: Push your stable branch to GitHub (e.g. `git push origin stable`).
3737
1. Release: Create a [new release](https://github.com/10up/action-wordpress-plugin-deploy/releases/new), naming the tag and the release with the new version number, and targeting the `stable` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the [milestone](https://github.com/10up/action-wordpress-plugin-deploy/milestones/#?closed=1). The release should now appear under [releases](https://github.com/10up/action-wordpress-plugin-deploy/releases).
3838
1. Ensure it appears in the GitHub Marketplace correctly.
3939
1. Close milestone: Edit the [milestone](https://github.com/10up/action-wordpress-plugin-deploy/milestones/) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description field`), then close the milestone.

0 commit comments

Comments
 (0)