Merge 2.17.x up into 2.18.x #11201
Merged
Merge 2.17.x up into 2.18.x #11201
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
This will help to make sure we don't lose those parts of the SQL when working on doctrine#11188.
…utput-walker-test Cover limit/offset values in `LimitSubqueryOutputWalkerTest`
Fix calls to removed lock methods (doctrine#11061)
greg0ire
approved these changes
Jan 31, 2024
|
Thanks @mpdude ! |
|
Merging 2.18 into 3.0 seems way more complex with lots of conflicts. How to best approach that? |
|
You may cherry-pick your commit so that you don't have to deal with the merge up. In general, to deal with big merges up, the best is to merge a commit that is not the latest 2.18, but something between the last merge up point and now. https://github.com/mhagger/git-imerge can help with automating that. |
|
That being said, the diff between those branches seems small, so it's a bit suprising that you're having conflicts 🤔 : 3.0.x...2.18.x Have you made sure your copy of 3.0.x is up to date? |
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.
LimitSubqueryOutputWalkerTest