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

It is not actually needed; we can read the values from AmazonQLspService
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner August 14, 2025 22:45
@rli rli merged commit aeb459a into feature/remote-chat-lsp Aug 14, 2025
3 of 8 checks passed
@rli rli deleted the autoMerge/feature/remote-chat-lsp branch August 14, 2025 23:45
@github-actions
Copy link

github-actions bot commented Aug 15, 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