Merge 3.X into 4.X #16378
Merged
Merge 3.X into 4.X #16378
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
* Fix plugins might not be updated when updating core * dont invalidate all caches as it could have side effects re template etc * dont invalidate cache * fix error if marketplace is not enabled, fallback to direct dispatch if climulti doesnt work * show update log * fix test
tsteur
added
the
not-in-changelog
|
@tsteur It's better not to use Pull Request to merge changes from 3.x-dev to 4.x-dev. The next time someone tries to do another merge from 3.x-dev the same commits will be tried to merge again, as they were squashed when merging the PR and thus they don't exsist in 4.x-dev. I usual do the merge on a second branch to check the travis build, but push the merge on 4.x-dev directly |
|
👍 forgot about that one. Will do next time. I reckon in this case it was likely (hopefully) the last time we had to merge 3.x into 4.x and instead issue separate PRs if needed or so |
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.
No description provided.