Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(README): Update our branching strategy #2205

Merged
merged 1 commit into from
Dec 21, 2016
Merged

chore(README): Update our branching strategy #2205

merged 1 commit into from
Dec 21, 2016

Conversation

jayphelps
Copy link
Member

@jayphelps jayphelps commented Dec 20, 2016

As discussed in today's RxJS team meeting, we feel it would be more simple to use two branches instead of three.

  • master - commits that will be included in the next minor or patch release
  • next - commits that will be included in the next major release (breaking changes)

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 just major ?

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.

@coveralls
Copy link

coveralls commented Dec 20, 2016

Coverage Status

Coverage remained the same at 97.674% when pulling 1612c4f on branching into dc06e01 on master.

@tetsuharuohzeki
Copy link
Contributor

@jayphelps Do you have any plan to release this next branch as alpha build or nightly build?

@jayphelps
Copy link
Member Author

@saneyuki not anything committed yet, but we're definitely considering it. The next branch won't likely change too often, since we won't have super frequent breaking changes. We're more interested in releasing a package version that is some form of canary--which would basically include anything we would include in the next release; usually that's just what is in master, but when we're nearing a major version bump, that will include things from next. We're not 100% set on the name next since it's ambiguous--it means "next major version release" not "next release in general".

@coveralls
Copy link

coveralls commented Dec 21, 2016

Coverage Status

Coverage remained the same at 97.674% when pulling fbaa37c on branching into dc06e01 on master.

@tetsuharuohzeki
Copy link
Contributor

@jayphelps

I see.

We're more interested in releasing a package version that is some form of canary--which would basically include anything we would include in the next release

How long are you planning to release major version? Is it on-demand-driven? or be still in considering?

@benlesh
Copy link
Member

benlesh commented Dec 21, 2016

LGTM

@benlesh benlesh merged commit 45b842c into master Dec 21, 2016
@benlesh benlesh deleted the branching branch March 29, 2018 22:16
@lock
Copy link

lock bot commented Jun 6, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Jun 6, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants