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

Merge 0.23.1 into master #4791

Merged
merged 1 commit into from Aug 5, 2017
Merged

Merge 0.23.1 into master #4791

merged 1 commit into from Aug 5, 2017

Conversation

matiasgarciaisaia
Copy link
Member

@matiasgarciaisaia matiasgarciaisaia commented Aug 4, 2017

We've never merged 0.23.1 into master, so here it is.

It's just #4649.

RX14
RX14 approved these changes Aug 4, 2017
Copy link
Contributor

@RX14 RX14 left a comment

A bit weird that this went into a different branch...

@straight-shoota
Copy link
Member

@straight-shoota straight-shoota commented Aug 4, 2017

@RX14 The benefit is, while the bugfixes for 0.23.0 where commited to 0.23.1, other improvements could be still be added into master. Otherwise you'd either have feature commits in 0.23.1 or other pull requests would be stalled until 0.23.1 is released.

@RX14
Copy link
Contributor

@RX14 RX14 commented Aug 4, 2017

We've always just merged everything into master from what I can see, if we want to have stable and bugfix branches, I think that merits further discussion. Mainly just so we can all get on the same page that these branches exist and the details of how they are used.

@matiasgarciaisaia
Copy link
Member Author

@matiasgarciaisaia matiasgarciaisaia commented Aug 5, 2017

This went to a different branch because of what @straight-shoota said. In addition, the branch was re-created this week, because the Travis setup needs a branch pointing to a tagged commit to be pushed in order to build and update the docs. We could now delete release/0.23, but I don't think it matters.

As for what we were doing previously - I'm really not sure, haven't been that involved before. I totally agree we should agree on a way, and go with it. I think I (personally) some more time around here to have an informed opinion, anyway :)

@matiasgarciaisaia matiasgarciaisaia merged commit b5dd948 into master Aug 5, 2017
3 checks passed
@akzhan
Copy link
Contributor

@akzhan akzhan commented Oct 20, 2017

:trup:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants