Skip to content

DOC: GH10414 Missing example in NA values in GroupBy #10450

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

Conversation

harshnisar
Copy link
Contributor

closes #10414

@jreback jreback added this to the 0.17.0 milestone Jun 26, 2015
@jreback
Copy link
Contributor

jreback commented Jun 26, 2015

@harshnisar see the contributing docs here

pls pull current master and rebase. I know its only a trivial change, but this is in conflict as master changed a tiny bit in this section a couple of days ago.

@harshnisar harshnisar force-pushed the GH10414-DOC-missing-example branch from 485e63e to 6e10194 Compare June 27, 2015 08:48
@harshnisar
Copy link
Contributor Author

@jreback

Done :)

See the groupby section :ref:`here <groupby.missing>` for more information.
=======
.. ipython:: python
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need to remove the conflict lines
further I would move your change above the see further reference

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jreback
Embarrassing. Sorry.

@harshnisar harshnisar force-pushed the GH10414-DOC-missing-example branch from 6e10194 to 925d6f3 Compare June 28, 2015 18:59

See the groupby section :ref:`here <groupby.missing>` for more information.
=======
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this snuck in during a rebase/merge?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shoyer In my defence, it really did fit well. Changed 👍 Embarrassed.

@jorisvandenbossche
Copy link
Member

Looks good now! @harshnisar Last question: can you squash the three commits into one? (see end of this section: http://pandas.pydata.org/pandas-docs/stable/contributing.html#committing-your-code)

@harshnisar harshnisar force-pushed the GH10414-DOC-missing-example branch 2 times, most recently from 80c241d to 46def53 Compare July 1, 2015 09:49
@harshnisar harshnisar force-pushed the GH10414-DOC-missing-example branch from 46def53 to 204ce41 Compare July 1, 2015 10:41
@harshnisar
Copy link
Contributor Author

@jorisvandenbossche I know by now, this pull request is more of an effort sink for you than a contribution by me. Won't happen from next pulls.

@jorisvandenbossche
Copy link
Member

@harshnisar no, no problem! And thanks!

jorisvandenbossche added a commit that referenced this pull request Jul 1, 2015
DOC: GH10414 Missing example in NA values in GroupBy
@jorisvandenbossche jorisvandenbossche merged commit cbb2673 into pandas-dev:master Jul 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Documentation: Example missing in NA values by GroupBy
4 participants