Skip to content

Instantly share code, notes, and snippets.

@JosephTLyons
Last active November 1, 2022 14:16
Show Gist options
  • Save JosephTLyons/e07f88c753526203d098c193812c3e7b to your computer and use it in GitHub Desktop.
Save JosephTLyons/e07f88c753526203d098c193812c3e7b to your computer and use it in GitHub Desktop.
[main] <------- [preview] <------- [stable]
^ ^ ^
| | stable release bug PRs target this branch, then stable -> preview, then preview -> main
| |
| preview release bug PRs target this branch, then preview -> main
|
new feature PRs target this branch, bug fix PRs relating to new features target this branch
One release day, merge
- merge preview -> stable
- merge main -> preview
- tag newest commits on preview and stable
- preview and stable are released
Pros:
- Don't have to manually keep track of which things to cherry pick
- Don't have to create new branches for each version, these branches can be used repeatedly
Cons
- Lots of merge commits, but instead of merging up the line every time a PR merges in, merging up the chain could happen once a day,or something
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment