Repository navigation
ci: Fix image preload with multiple conflicts - #30274
Merged
QuLogic merged 1 commit intoJul 9, 2025
Merged
QuLogic merged 1 commit into
QuLogic merged 1 commit into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
Since this passed on 854caff, I've dropped that commit. |
Sorry, something went wrong.
jkseppan
approved these changes
Jul 9, 2025
Copy link
Copy Markdown
Member
Author
|
Arg, I seem to have accidentally committed the mlab bits here instead of #30273. But anyway, it should get joined up when main is merged into this branch again. |
Sorry, something went wrong.
3 of 5 tasks
wavebyrd
pushed a commit
to wavebyrd/matplotlib
that referenced
this pull request
Mar 13, 2026
ci: Fix image preload with multiple conflicts
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
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.
PR summary
I only tested #30231 with a single conflict. Unfortunately, the variable quoting did not work when there were multiple conflicts. This PR should fix that (and currently has a test change to verify it.)
PR checklist