You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
@spencertransier, given the PR title, I took the liberty to update the base branch from trunk to release/24.1. However, there are still merge conflicts 🤔
@mokagio I had started working on those merge conflicts when I realized that there will need to be a new version of Gutenberg that includes the hotfix as well. So I thought it made sense to wait until that is released (see p1705991079495289/1705947847.142679-slack-CC7L49W13) before finishing the merge conflicts since the first two are related to the Gutenberg version.
How would you normally handle a situation like this?
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.
This PR merges the changes from the 24.0.1 hotfix into
release/24.1
. Includes: