Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
Fix inversion of shared axes.#14598
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
@ivanov I don't think you really wanted to do that commit, did you? We don't normally merge master into a branch. Was a rebase needed instead? |
thanks for catching that, Eric, indeed I went in to merge not realizing that a rebase was needed. Then I wasn't sure how my GitHub UI conflict resolution was going to be reflected back in git land. Should I rebase and force push to this branch@anntzer's original commits, omitting mine? |
if there was a place to put down a different commit message to the conflict resolution, I missed it. |
Yes, I think that should work. Pull to a local branch, rebase to keep just the original commit, and force-push back here should be OK. I'm not a git wizard, though. |
set_view_interval does not update shared axes, we must useset_xlim/set_ylim to do so.Update a test to explicitly invert an axis instead of relying on imshowto implicitly do so.
The rebase looks fine? I don't think I have to do anything at that point? |
Github's "resolve conflict" method is merge (which if I were given a choice of what to implement in a webUI it would be merge not rebase...). |
…598-on-v3.1.xBackport PR#14598 on branch v3.1.x (Fix inversion of shared axes.)
set_view_interval does not update shared axes, we must use
set_xlim/set_ylim to do so.
Update a test to explicitly invert an axis instead of relying on imshow
to implicitly do so.
Fix a regression due to#13330.
PR Summary
PR Checklist