resolve merge conflicts into master #2137
Merged
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
chore: ASP.NET Core version update in Dockerfiles
… that closed GitHub discussions are not auto-reopened. (#2085)
Sync dev and master
* Bump github/codeql-action from 3.28.19 to 3.29.2 (#2098) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.19 to 3.29.2. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@fca7ace...181d5ee) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.29.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump aws-actions/aws-secretsmanager-get-secrets from 2.0.9 to 2.0.10 (#2099) Bumps [aws-actions/aws-secretsmanager-get-secrets](https://github.com/aws-actions/aws-secretsmanager-get-secrets) from 2.0.9 to 2.0.10. - [Release notes](https://github.com/aws-actions/aws-secretsmanager-get-secrets/releases) - [Commits](aws-actions/aws-secretsmanager-get-secrets@5e19ff3...a9a7eb4) --- updated-dependencies: - dependency-name: aws-actions/aws-secretsmanager-get-secrets dependency-version: 2.0.10 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: ASP.NET Core version update in Dockerfiles (#2103) Co-authored-by: aws-sdk-dotnet-automation <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: aws-sdk-dotnet-automation <[email protected]>
Sync Dev and Master
Sync Dev and Master
Sync dev and master
GarrettBeatty
added
the
Release Not Needed
philasmar
approved these changes
Sep 16, 2025
AlexDaines
approved these changes
Sep 16, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Issue #, if available:
merge master into dev to resolve merge conflicts. and then when we create pr to merge dev into master there should be no conflicts
Description of changes:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.