Skip to content

Conversation

@cpcloud
Copy link
Member

@cpcloud cpcloud commented Jun 26, 2013

No description provided.

@ghost ghost assigned cpcloud Jun 26, 2013
@jreback
Copy link
Contributor

jreback commented Jun 26, 2013

@cpcloud complete side note.....prob should add the version added directive wherever possible in the docs...course one would have to go back over the whatsnews/release notes and manually add...maybe add this as a good first pr project?

@cpcloud
Copy link
Member Author

cpcloud commented Jun 26, 2013

indeed maybe we should be more strict about PRs using as well, going forward?

@jreback
Copy link
Contributor

jreback commented Jun 26, 2013

well..its only in the main docs....I always forget about it....its a nice thing to do though

@cpcloud
Copy link
Member Author

cpcloud commented Jun 26, 2013

ok, not super important so will do if i remember from now on maybe i will add a shell script to run when i write a commit message that tells me about it

@jreback
Copy link
Contributor

jreback commented Jun 26, 2013

why don't you rebase and try to get this in...?

@cpcloud
Copy link
Member Author

cpcloud commented Jun 26, 2013

damn i really screwed that up. i thought there would be a bunch of merge conflicts so i did git rebase -s ours upstream/master. horrible idea since of course after RTFM i see that that discards the patch from my branch.

@jtratner
Copy link
Contributor

git reflog is your friend :)

On Wed, Jun 26, 2013 at 12:14 PM, Phillip Cloud notifications@github.comwrote:

damn i really screwed that up. i thought there would be a bunch of merge
conflicts so i did git rebase -s ours upstream/master. horrible idea
since of course after RTFM i see that that discards the patch from my
branch.


Reply to this email directly or view it on GitHubhttps://github.com//pull/4038#issuecomment-20060178
.

@cpcloud
Copy link
Member Author

cpcloud commented Jun 26, 2013

@jtratner oh gosh i feel like such a git n00b, thanks!

@cpcloud
Copy link
Member Author

cpcloud commented Jun 26, 2013

and ....we're back

@jreback
Copy link
Contributor

jreback commented Jun 26, 2013

looks reasonable

cpcloud added a commit that referenced this pull request Jun 26, 2013
@cpcloud cpcloud merged commit 73de5de into pandas-dev:master Jun 26, 2013
@cpcloud cpcloud deleted the rls-whatsnew-version-number-update branch June 26, 2013 17:00
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.

3 participants