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

Revert recent changes #111

Closed
js850 opened this issue Dec 9, 2014 · 1 comment
Closed

Revert recent changes #111

js850 opened this issue Dec 9, 2014 · 1 comment

Comments

@js850
Copy link
Member

js850 commented Dec 9, 2014

Kyle, I don't know what that series of pull requests / revers was, but I just reset the master branch to what it was an 20 minutes ago. I saved the state of master in the new branch contaminated_master. If anyone has pulled in the last 20 minutes your local version of master will be contaminated. Be sure to fix your local master before pushing.

These are the confusing PRs #110 #109
@khs26
Copy link

khs26 commented Dec 9, 2014

Yeah, as I said in the closed reverting PR, I accidentally pulled from my fork rather than pulling the pele-python commits to my fork. The subsequent PRs were to revert those changes, since we don't want them in the repository yet.

@js850 js850 closed this as completed Dec 9, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@js850 @khs26