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.

Sign up for GitHub

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

Jump to bottom

Fix force-push to master #2094

Merged
merged 9 commits into from
Dec 15, 2016
Merged

Fix force-push to master #2094

merged 9 commits into from
Dec 15, 2016

Conversation

foot
Copy link
Contributor

@foot foot commented Dec 15, 2016 •
edited by 2opremio
Loading

does it?

ekimekim and others added 9 commits December 5, 2016 15:43
@2opremio 2opremio changed the title Maybe old master Fix force-push to master Dec 15, 2016
@2opremio
Copy link
Contributor

2opremio commented Dec 15, 2016 •
edited
Loading

Here's what happened for future reference.

@fbarl force-pushed to bbcf184 when master's tip was at 5ed63de . That caused PRs #2082 , #2086 and #2060 to be lost.

We used CircleCI to reconstruct what happened (since it builds on every commit to master).

This PR fixes it.

@2opremio 2opremio merged commit 8e78c0c into master Dec 15, 2016
@2opremio 2opremio deleted the maybe-old-master branch December 15, 2016 17:26
@2opremio 2opremio mentioned this pull request Dec 15, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@foot @2opremio @ekimekim @jml @schu