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

Revert merge master into 2.2 #1924

Conversation

teohhanhui
Copy link
Contributor

Q A
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #1850 (comment)
License MIT
Doc PR N/A

Please see #1923 for how it's done.

It was an accident. Let us undo the mess.
@teohhanhui teohhanhui requested a review from a team May 2, 2018 16:25
@teohhanhui
Copy link
Contributor Author

159 files changed 😱 😅

Copy link
Member

@soyuka soyuka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's 🤞 for tests

@teohhanhui
Copy link
Contributor Author

Travis build almost completed on my repo: https://travis-ci.org/teohhanhui/api-platform-core/builds/374012816

It should be fine. 😃

Copy link
Contributor

@sroze sroze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

@soyuka soyuka merged commit cc34af9 into api-platform:2.2 May 2, 2018
@soyuka
Copy link
Member

soyuka commented May 2, 2018

Oh yeah ❤️ thanks a lot @teohhanhui

@teohhanhui teohhanhui deleted the revert-merge-master-into-2.2-no-rewriting-history branch May 2, 2018 17:16
@sroze
Copy link
Contributor

sroze commented May 2, 2018 via email

@dunglas
Copy link
Member

dunglas commented May 2, 2018

Thank you very much for handling this!!

@teohhanhui
Copy link
Contributor Author

@soyuka suggested that I write a blog post about it. Maybe we could make it a post mortem analysis? And how we could prevent this from happening again... 😂

@dunglas
Copy link
Member

dunglas commented May 2, 2018

would be great!

@sroze
Copy link
Contributor

sroze commented May 2, 2018

Definitely! It would be a nice one. Just the fact I've lost ~3 hours going to the wrong direction shows it definitely deserves a blog post (it would have saved me some time hehe)

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

4 participants