Merge v1.17 into v1.18 #1315
Merged
Merge v1.17 into v1.18 #1315
Conversation
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
Co-authored-by: Mike Woofter <[email protected]>
|
In this Slack thread, @GromNaN mentioned that #1308 split Rector into its own CI job. I'm not sure why it's still included in the Psalm job above. Does this require a manual PR where I create a branch from v1.18, merge v1.17 into that, and then open a PR to merge into v1.18? |
alcaeus
approved these changes
May 22, 2024
This was referenced May 22, 2024
Merged
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.
Merge new changes from v1.17 into v1.18.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v1.18 and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.