-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
BUG: merge between partial index and index fails when result is empty #34414
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
jreback
merged 16 commits into
pandas-dev:master
from
phofl:33814_merge_partial_index_and_index_fails_empty_result
Jan 3, 2021
Merged
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
49f864a
BUG: Merge crashed when left_on is in index, right_index is True and …
phofl e4da7c5
Change whatsnew entry
phofl 1440bce
Change whatsnew entry
phofl c0da36e
Parametrize test
phofl b9b47c5
Add issue number
phofl c32928d
Fix whatsnew issue
phofl 1922fb9
Merge branch 'master' of https://github.com/pandas-dev/pandas into 33814
phofl 783af3a
Change test, simplify
phofl 17cba7c
Merge branch 'master' of https://github.com/pandas-dev/pandas into 33814
phofl d396576
Merge branch 'master' of https://github.com/pandas-dev/pandas into 33814
phofl af000ea
Move whats new note
phofl 647bbc3
Merge branch 'master' of https://github.com/pandas-dev/pandas into 33814
phofl 2d22b80
Merge branch 'master' of https://github.com/pandas-dev/pandas into 33814
phofl 28557c6
Move whatsnew
phofl efc6eb1
Remove pd
phofl d5d6c8e
Rename test
phofl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.