Skip to content

Conversation

aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origin/feature/disable-sspc
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/disable-sspc

rli added 2 commits July 25, 2025 12:42
due to an AWS JS SDK v2 bug (which is EoL), profile redeclarion, though spec compliant,
will result in a flare crash
@rli rli closed this Jul 29, 2025
Copy link

github-actions bot commented Jul 29, 2025

Qodana Community for JVM

It seems all right 👌

No new problems were found according to the checks applied

☁️ View the detailed Qodana report

Contact Qodana team

Contact us at [email protected]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants