Skip to content

build: merge main into feature/dungdong - #243

Merged
dungdong-aws merged 4 commits into
Amazon-Q-Developer:feature/dungdongfrom
dungdong-aws:build/merge-main-into-feature-dungdong
Nov 18, 2026
Merged

dungdong-aws merged 4 commits into
Amazon-Q-Developer:feature/dungdongfrom
dungdong-aws:build/merge-main-into-feature-dungdong

Conversation

@dungdong-aws

Copy link
Copy Markdown
Contributor

PR #242 (main → feature/dungdong) conflicts in packages/amazonq/test/unit/amazonq/lsp/config.test.ts: #230 landed on both branches as separate commits, and #234 on main changed the adjacent lines.

This branch merges main (f1ef1f1) into feature/dungdong and resolves that file to main's version, which already contains both #230 and #234. No other files conflicted. Supersedes #242.

Please merge with Create a merge commit so main stays in this branch's history; squash or rebase would drop it and the next sync would conflict again.

License

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

…-Developer#234)

Send `awsClientCapabilities.q.workspaceTrust` at initialize and
`aws/updateConfiguration` (`aws.q.workspaceTrust`) when VS Code grants
trust, so the language server starts local MCP servers only in trusted
workspaces.
…-Q-Developer#230) (Amazon-Q-Developer#237)

* fix(amazonq): read developer override settings from user settings only

* fix(amazonq): scope packaged developer settings

* fix(amazonq): use extension mode for dev overrides

* fix(amazonq): defer developer settings until activation

* fix(amazonq): own developer settings lifecycle

* fix(amazonq): scope developer settings in manifest
…-Developer#239)

* Release 2.10.0

* Update version to snapshot version: 2.11.0-SNAPSHOT

---------

Co-authored-by: aws-toolkit-automation <>
# Conflicts:
#	packages/amazonq/test/unit/amazonq/lsp/config.test.ts
@dungdong-aws
dungdong-aws requested a review from a team as a code owner November 18, 2026 19:01
@dungdong-aws
dungdong-aws merged commit e340966 into Amazon-Q-Developer:feature/dungdong Nov 18, 2026
18 checks passed
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.

3 participants