Skins: Fix sidebar item styling on 2.4 too #11975
Merged
Conversation
This file contains 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
|
I didn't pay attention either, sorry. LGTM |
|
I'm surprised that merging 2.4 into main worked without conflicts... |
|
After the cherry-pick? If the lines are matching byte-for-byte Git shouldn't produce conflicts even for diverged histories, so that would be the expected behavior. |
|
maybe my memory is deceiving me, and it was just rebases where I encountered those ridiculous 3-way diffs? 🤷 |
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.
Forgot this affected 2.4 too, so here's a cherry-pick of #11970 onto 2.4
cc @ronso0