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

rli and others added 10 commits June 3, 2025 11:07
There was a threading issue where since the file was opened in EDT and the result was sent back to the server on another thread, it returned the result before the file was opened. This PR makes it synchronous
…#5787)

* fix(amazonq): fix issue where chat messages get sent to all projects

* callsites

---------

Co-authored-by: manodnyab <[email protected]>
We need some visibility on how prevalent failures are
* make chat unaccessible on 242.2.1

* detekt

* feedback

* detekt

* alias

* simplify

* fix product code

* Update plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt

Co-authored-by: Richard Li <[email protected]>

* update message

* Update plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

* revert

---------

Co-authored-by: manodnyab <[email protected]>
Co-authored-by: Richard Li <[email protected]>
feat(amazonq): Agentic coding experience
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners June 5, 2025 15:03
aws-toolkit-automation and others added 3 commits June 5, 2025 15:08
 Conflicts:
	plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
Copy link

github-actions bot commented Jun 5, 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]

@rli rli merged commit 8cb5ea2 into feature/bid-paid Jun 6, 2025
14 of 16 checks passed
@rli rli deleted the autoMerge/feature/bid-paid branch June 6, 2025 21:02
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