Skip to content

Autocorrelation plot #1425

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

Closed
wants to merge 11 commits into from
Closed

Autocorrelation plot #1425

wants to merge 11 commits into from

Conversation

orbitfold
Copy link
Contributor

@wesm
Copy link
Member

wesm commented Jun 10, 2012

Cool. Could you be a bit more careful about not merging upstream into your feature branches? Makes merging the branch back to master a lot harder for me

@orbitfold
Copy link
Contributor Author

Sure

@wesm
Copy link
Member

wesm commented Jun 11, 2012

Sorry, ignore my comment on the other PR, I see the same thing happened here

wesm added a commit that referenced this pull request Jun 11, 2012
@wesm
Copy link
Member

wesm commented Jun 11, 2012

Not sure what happened, but it looks like this branch was not based off of pydata/master-- this resulted in very confused git (cherry-picking failed). I committed and pushed the changes by hand, but if it happens again I'll make you redo the PR / commits with a clean branch =)

@wesm wesm closed this Jun 11, 2012
@orbitfold
Copy link
Contributor Author

Yes, sorry about that. I am not quite sure what happened myself, I am still a bit clumsy with git. I am used to mercurial. You shouldn't feel bad forcing me to resubmit pull requests if needed.

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.

2 participants