-
Notifications
You must be signed in to change notification settings - Fork 309
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge releases/v3 into releases/v2 #2144
Merged
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
Remove some inadvertently checked in build files
This prevents it from becoming part of the analysis.
Mergeback v3.24.1 refs/heads/releases/v3 into main
Avoid analyzing generated configuration file
Co-authored-by: Henry Mercer <henry@henrymercer.name>
…for-branch Add backticks around branch in update-release-branch PR template
…licts Teach rebuild Action how to resolve conflicts in lib
Introduce a rollback mechanism for Java buildless
Deprecate fine-grained parallelism feature-flag
Co-authored-by: Henry Mercer <henrymercer@github.com>
Merge main into releases/v3
This reverts commit d8c4c3a.
This reverts commit 05d809f.
Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks. |
angelapwen
approved these changes
Feb 15, 2024
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.
Merging ece8414 into
releases/v2
.Conductor for this PR is @angelapwen.
Contains the following pull requests:
Please do the following:
releases/v2
branch.Create a merge commit
is selected rather thanSquash and merge
orRebase and merge
.