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

samgst-amazon and others added 2 commits July 10, 2025 09:19
…ts, remove alternate entrypoint (#5856)" (#5891)" (#5893)

This reverts commit b9347c6.

Co-authored-by: Bryce Ito <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners July 10, 2025 16:20
aws-toolkit-automation and others added 11 commits July 10, 2025 18:24
- Re-enable `DefaultModuleDependenciesService` it was disabled due to lsp wasn't able to handle these large amount of request. 
- Adding a step to de-dup and merge request, this reduce the `apache/dubbo` repo events from 439 to 112
- Partition the event by 10 per seconds to control the event flow to flare, this is needed to prevent flare freezing
Sometimes the error body is not actually useful
```
An unexpected error occurred, check the logs for more information.
```

After:
```
McpManager not initialized—call McpManager.init(...) first: An unexpected error occurred, check the logs for more information.
```
…file (#5897)

* add missing params to node

* implement applyEdit client logic

* clean up util functions

* changelog

* reduce serializer calls

* tests for applyWorkspaceEdit

* formatting
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]

@rli rli merged commit eb1ff0c into feature/remote-chat-lsp Jul 28, 2025
14 of 18 checks passed
@rli rli deleted the autoMerge/feature/remote-chat-lsp branch July 28, 2025 17:55
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.

6 participants