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

Revert recent style cleanup changes #1236

Merged
merged 1 commit into from Mar 4, 2015

Conversation

Projects
None yet
2 participants
@crabmusket
Contributor

crabmusket commented Mar 4, 2015

It seems to be fairly unanimous that the style cleanup PR was a bad idea, especially so late in 3.7, so we'll revert it and re-add it for 3.8, subject to a little more discussion. In the meantime, get thee gone!

Note that this means the 3,000 line changeset will appear three times in the history - original merge, reversion, and reinstatement (if we decide we want it in the end). Sorry, but that's just how the cookie crumbles. Rebasing history in a public repo is a can of worms I'm not gonna open right now.

@crabmusket crabmusket added the Bug label Mar 4, 2015

@crabmusket crabmusket added this to the 3.7 milestone Mar 4, 2015

@JeffProgrammer

This comment has been minimized.

Show comment
Hide comment
@JeffProgrammer

JeffProgrammer Mar 4, 2015

Contributor

stuff happens, honestly think its better to do that instead of hoping it don't break more stuff :)

Contributor

JeffProgrammer commented Mar 4, 2015

stuff happens, honestly think its better to do that instead of hoping it don't break more stuff :)

crabmusket added a commit that referenced this pull request Mar 4, 2015

@crabmusket crabmusket merged commit 74a0585 into GarageGames:development Mar 4, 2015

@crabmusket crabmusket deleted the crabmusket:revert-style-cleanup branch Mar 4, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment