Skip to content

Commit

Permalink
GH-25 ⚡️ Minor edits to deploy workflow (edit the issue template) (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian Torres authored Jun 28, 2020
1 parent 5dabda8 commit a39c9bd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/deploy-to-production.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ assignees: macintacos

- [ ] Create a new branch: `git checkout -b GH-<this_issue_number>`
- [ ] Run the following script (fill out the relevant information, edit the CHANGELOG so that it's appropriate): `yarn run release`
- [ ] After pushing, create a PR opened against `master` (not `develop`). It should have the same naming convention. Merge that PR.
- [ ] Switch to `develop` and `git rebase` the changes from `master` before resuming normal development
- [ ] After pushing, create a PR opened against `develop`. It should have the same naming convention. Squash/merge that PR as normal.
- [ ] Open a PR from `develop` -> `master`. Perform a _rebase_ merge, **not a squash merge**.
- [ ] Close this issue once all of the above is completed.

1 comment on commit a39c9bd

@vercel
Copy link

@vercel vercel bot commented on a39c9bd Jun 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.