8000 Fix for issue 4476 by gerritholl · Pull Request #4477 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Fix for issue 4476 #4477

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
Closed
wants to merge 0 commits into from
Closed

Fix for issue 4476 #4477

wants to merge 0 commits into from
+0 −0

Conversation

gerritholl
Copy link
Contributor

This pull request fixes issue #4476 by adding fill values for all possible datetime dtypes.

@jaimefrio
Copy link
Member

@gerritholl can you find some time to fix the failing test?

@gerritholl
Copy link
Contributor Author

Finally I took the time to come back to this (mainly to study how git works). I have changed the syntax to be more basic. I don't know how to run formal tests but it appears basic functionality works. Is this OK for merging? Or should I rebase it into a single commit?

@charris
Copy link
Member
charris commented Jan 14, 2015

Well, you have introduced some problems ;) First, you need to work in a branch rather than master, and second, merging from upstream has now put your master out sync. The commits should also be squashed. This could be tricky to recover from while keeping your work. Hmm..., first co a new branch that will contain your work git checkout -b <new branch>, then try git rebase -i HEAD~4 and delete the merge. That may or may not clean up the branch. You can also squash the commits at the same time and reword the commit message to something that begins with BUG:. Then checkout your master and git reset --hard HEAD~n, where n is the number of new commits you have made since the last valid commit in master. You can then update master git pull --ff-only upstream master. After that, get back in your work branch and do git rebase master and fix the merge problems. Think of it all more git practice. Note that in current master doc/source/dev/gitwash/development_workflow.rst has updated instructions for hacking that might be helpful.

@gerritholl gerritholl closed this Jan 14, 2015
@gerritholl
Copy link
Contributor Author

I added a new pull request #5455. I hope that one is in order! Please let me know if I've still messed up something :)

@gerritholl gerritholl mentioned this pull request Jan 15, 2015
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.
3 participants
@gerritholl @jaimefrio @charris
0