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 review from a team as code owners April 17, 2025 22:48
@rli rli force-pushed the autoMerge/feature/q-lsp-chat branch from 32c2ef6 to 846ab2f Compare April 17, 2025 22:55
@rli rli merged commit 6f4907c into feature/q-lsp-chat Apr 17, 2025
3 of 9 checks passed
@rli rli deleted the autoMerge/feature/q-lsp-chat branch April 17, 2025 22:55
@github-actions
Copy link

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.

5 participants