Skip to content

Conversation

jaitaiwan
Copy link
Contributor

By having merged to master we have to do one of the following:
a) Rebase develop and screw everyone's downstream develop branches; or:
b) Merge master into develop, possibly causing merge conflicts and cause regressions; or:
c) Patch both develop and master with the change, causing a (easier to solve) merge conflict between master and develop when making a release active

My suggestion is that we revert the change, make sure the pull request is made against the develop branch and rebase the release/1.9 branch on top making the chance of regression, and angry downstream contributors very unlikely.

@jaitaiwan
Copy link
Contributor Author

@rickhanlonii can you review?

@rickhanlonii
Copy link
Collaborator

Looks good.

jaitaiwan added a commit that referenced this pull request Aug 19, 2015
@jaitaiwan jaitaiwan merged commit e417818 into master Aug 19, 2015
@jaitaiwan jaitaiwan deleted the revert-188-feature/classifiers branch September 12, 2015 11:45
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.

2 participants