Skip to content

TST: test for GH2623, object in frame upconverting a datetime64[ns] in another column #3142

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

Merged
merged 1 commit into from
Mar 22, 2013

Conversation

jreback
Copy link
Contributor

@jreback jreback commented Mar 22, 2013

this is tests only at #2623 is covered by other PRS

jreback added a commit that referenced this pull request Mar 22, 2013
TST: test for GH2623, object in frame upconverting a datetime64[ns] in another column
@jreback jreback merged commit 1bd9cc7 into pandas-dev:master Mar 22, 2013
@wesm
Copy link
Member

wesm commented Mar 23, 2013

You can feel free to push commits like this directly.

@jreback
Copy link
Contributor Author

jreback commented Mar 23, 2013

yep, makes sense

@ghost
Copy link

ghost commented Mar 23, 2013

if you merge branches manually and push, please use merge --no-ff, to ensure a merge commit
that packages up related commits into a well-defined block. no need if it's something small.

@jreback
Copy link
Contributor Author

jreback commented Mar 23, 2013

how is that different from pushing to my local branch then auto merging? which generates the merge commit
we do want the merge commit , right?

@ghost
Copy link

ghost commented Mar 23, 2013

no difference, it's just the command line equivalent of the greenbutton.
for a PR with serveral coupled commits, I prefer a merge commit yes.
But I often push singles straight to master.

@jreback
Copy link
Contributor Author

jreback commented Mar 23, 2013

ok that's great thanks

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