chore(README): Update our branching strategy #2205
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in today's RxJS team meeting, we feel it would be more simple to use two branches instead of three.
We need to make the actual branches for
next
still.We haven't really thought through the name
"next"
much. It is ambiguous, since it is intended to mean "next major release" (right now 6.0) not "next release in general" (e.g. 5.0.2) We didn't want to name the branch the literal version number, e.g.6.0
because it would mean switching branches for every major release--but perhaps that's not the end of the world. Alternative name suggestions welcome. Maybe justmajor
?We may also find that this approach isn't ideal. For example, ember and react both consider the
master
branch to be the latest and greatest canary, which includes everything (except short-lived patches that are incompatible), including breaking changes for future major version bumps. They then maintain a separate branch for the current stable version, cherry-picking commits for minor/patch releases. This is basically the opposite of what we just decided to do (described in this PR) It's unclear which approach is best for us.