Re-apply #3939 cleanly against the latest content on main#4042
Merged
kfranqueiro merged 4 commits intow3c:mainfrom Aug 30, 2024
Merged
Re-apply #3939 cleanly against the latest content on main#4042kfranqueiro merged 4 commits intow3c:mainfrom
kfranqueiro merged 4 commits intow3c:mainfrom
Conversation
✅ Deploy Preview for wcag2 ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
|
kfranqueiro marked as non substantive for IPR from ash-nazg. |
patrickhlauke
approved these changes
Aug 30, 2024
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
3 participants
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.
When #3939 was merged, conflicts were not resolved correctly, resulting in loss of #2455's update to 2.1.4 and loss of #3939's original update to 2.3.3.
This PR cleanly re-applies my original changes from #3939, restoring those other lost updates.
Screenshot of 2.1.4 in incorrect state from the bad merge (visible on the netlify main branch preview until this fix is merged):
Screenshot of 2.1.4 on this branch, with other changes restored (visible on this PR's preview):
2.3.3 was not visibly affected, because the build already corrects the problem case that #3939 cleans up.