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

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner May 8, 2025 20:15
@rli rli merged commit 22431f0 into feature/q-lsp-chat May 8, 2025
2 of 7 checks passed
@rli rli deleted the autoMerge/feature/q-lsp-chat branch May 8, 2025 20:19
@github-actions
Copy link

github-actions bot commented May 8, 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 [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