Skip to content

Revert merge master into 2.2#1924

Merged
soyuka merged 2 commits into
api-platform:2.2from
teohhanhui:revert-merge-master-into-2.2-no-rewriting-history
May 2, 2018
Merged

Revert merge master into 2.2#1924
soyuka merged 2 commits into
api-platform:2.2from
teohhanhui:revert-merge-master-into-2.2-no-rewriting-history

Conversation

@teohhanhui

Copy link
Copy Markdown
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
Copy Markdown
Contributor Author

159 files changed 😱 😅

@soyuka soyuka left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Contributor Author

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

It should be fine. 😃

@sroze sroze left a comment

Copy link
Copy Markdown
Contributor

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

soyuka commented May 2, 2018

Copy link
Copy Markdown
Member

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

sroze commented May 2, 2018 via email

Copy link
Copy Markdown
Contributor

@dunglas

dunglas commented May 2, 2018

Copy link
Copy Markdown
Member

Thank you very much for handling this!!

@teohhanhui

Copy link
Copy Markdown
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

dunglas commented May 2, 2018

Copy link
Copy Markdown
Member

would be great!

@sroze

sroze commented May 2, 2018

Copy link
Copy Markdown
Contributor

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.

4 participants