Skip to content

Merge main into feature/q-lsp-chat #5681

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

Merged
merged 3 commits into from
May 7, 2025

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/q-lsp-chat
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/q-lsp-chat

chengoramazon and others added 2 commits May 6, 2025 19:06
…5677)

Customization will only have "1" parent profile, so theoretically we don't need another call of listAvailableCustomization to check if the new profile has access to given profile or not. Instead, we could simply switch to default.
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners May 7, 2025 02:52
Copy link

github-actions bot commented May 7, 2025

Qodana Community for JVM

It seems all right 👌

No new problems were found according to the checks applied

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

@rli rli merged commit 43c1c65 into feature/q-lsp-chat May 7, 2025
13 of 16 checks passed
@rli rli deleted the autoMerge/feature/q-lsp-chat branch May 7, 2025 04:49
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.

4 participants