Skip to content
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

add a combine_attrs parameter to Dataset.merge #4895

Merged
merged 18 commits into from
Mar 6, 2021
Merged

add a combine_attrs parameter to Dataset.merge #4895

merged 18 commits into from
Mar 6, 2021

Commits on Jan 25, 2021

  1. add a combine_attrs kwarg to Dataset.merge

    @keewis
    keewis committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    2a237a0 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    0323ec6 View commit details
    Browse the repository at this point in the history

  2. document the new drop_conflicts value

    @keewis
    keewis committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    1d6a2e7 View commit details
    Browse the repository at this point in the history

  3. test that combine_attrs is passed through

    @keewis
    keewis committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    09c9343 View commit details
    Browse the repository at this point in the history

  4. fix the documented default of combine_attrs

    @keewis
    keewis committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    4263e11 View commit details
    Browse the repository at this point in the history

  5. update whats-new.rst

    @keewis
    keewis committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    61c63c0 View commit details
    Browse the repository at this point in the history

  6. minor fix [skip-ci]

    @keewis
    keewis committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    ae17625 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2021

  1. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Feb 21, 2021
    Configuration menu
    Copy the full SHA
    95ea7f0 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. minor fix [skip-ci]

    @keewis
    keewis committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    3d93e68 View commit details
    Browse the repository at this point in the history

  2. remove a empty line [skip-ci]

    @keewis
    keewis committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    689b690 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    17b083b View commit details
    Browse the repository at this point in the history

  4. fix bad merge [skip-ci]

    @keewis
    keewis committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    4c589cd View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2021

  1. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    1a8e83f View commit details
    Browse the repository at this point in the history

  2. fix bad merge [skip-ci]

    @keewis
    keewis committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    7d6416a View commit details
    Browse the repository at this point in the history

  3. remove the blank line after rst lists [skip-ci]

    @keewis
    keewis committed Feb 25, 2021
    Configuration menu
    Copy the full SHA
    fd4c328 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    fb15914 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    3f51147 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2021

  1. Merge branch 'master' into dataset-merge-combine_attrs

    @keewis
    keewis committed Mar 6, 2021
    Configuration menu
    Copy the full SHA
    015f1ca View commit details
    Browse the repository at this point in the history