REF: separate out cross-merge, make less stateful #53810
Merged
Conversation
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
mroeschke
reviewed
Jun 23, 2023
| left = left.assign(**{cross_col: 1}) | ||
| right = right.assign(**{cross_col: 1}) | ||
|
|
||
| if ( |
There was a problem hiding this comment.
I guess this validation could come before the assign but no big deal
There was a problem hiding this comment.
good idea will update
mroeschke
approved these changes
Jun 23, 2023
|
Just a merge conflict |
|
rebased+green |
|
Thanks @jbrockmendel |
Daquisu
pushed a commit
to Daquisu/pandas
that referenced
this pull request
Jul 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
doc/source/whatsnew/vX.X.X.rstfile if fixing a bug or adding a new feature.