branching-strategy
branching-strategy copied to clipboard
Update release deployment docs
Changes
- Releases should merge to
master
, then mergemaster
intodevelop
- ~~Add clarity to merging commands to ensure that local code isn't outdated~~
- Astro's release doc is long and has special cases. Use code style's release doc as reference instead
- Remove some redundancy around creating GitHub releases
How to Test
- Proofread doc changes
Todos:
- [ ] Update Release Deployment doc's diagrams as necessary
- [ ] +1
We should be adding a point that "When merging a hotfix into master
, and then master
into develop
, master
should also be merged into any currently open release branches."
Nothing blocking from me. Looks solid! 👍
It looks like our diagrams for the Release Deployment workflow are still showing merging from the release/hotfix into develop
. Maybe we put that on a TODO list, but it's certainly affected by the changes to this PR.
@jeremywiebe Do you know who owns the image files for the diagrams? I only see png files and can't edit them to reflect the changes in this PR.