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/v2-to-v3-migration
git merge origin/main
git commit
git push origin HEAD:refs/heads/autoMerge/feature/v2-to-v3-migration

XiaoxuanLu and others added 2 commits October 1, 2025 09:47
* chore: bump agentic version: 1.36.0

* fix(amazonq): fix to add opt-out header to streaming client (#2365) (#2369)

---------

Co-authored-by: aws-toolkit-automation <>
Co-authored-by: invictus <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner October 1, 2025 17:14
tsmithsz and others added 14 commits October 1, 2025 12:52
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: aws-toolkit-automation <>
)

Allow multiple loadChats() calls in JupyterLab environment.

Co-authored-by: ruotingx <[email protected]>
* feat: add model description to dropdown

* fix: bump up mynah version to enable hover
* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235)

* feat: migrate codewhisperer token service to aws-sdk-v3

* fix captureHeaders middleware

* feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284)

* refactor: remove aws-sdk v2 imports (#2290)

* fix: compile errors from merge conflicts (#2331)

* chore: bump runtimes to 0.3.0 (#2340)

* chore: bump runtimes to 0.3.0

* fix antlr4ng version conflict

* fix missing url polyfill

* chore: remove old ignore entries (#2350)

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
@chungjac chungjac closed this Oct 7, 2025
@chungjac chungjac reopened this Oct 7, 2025
* feat: migrate codewhisperer token service to aws-sdk-v3 (#2235)

* feat: migrate codewhisperer token service to aws-sdk-v3

* fix captureHeaders middleware

* feat: migrate codewhisperer iam service to aws-sdk-v3 (#2284)

* refactor: remove aws-sdk v2 imports (#2290)

* fix: compile errors from merge conflicts (#2331)

* chore: bump runtimes to 0.3.0 (#2340)

* chore: bump runtimes to 0.3.0

* fix antlr4ng version conflict

* fix missing url polyfill

* chore: remove old ignore entries (#2350)

---------

Co-authored-by: aws-toolkit-automation <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
Co-authored-by: Tai Lai <[email protected]>
@chungjac chungjac closed this Oct 7, 2025
@chungjac chungjac reopened this Oct 7, 2025
@chungjac chungjac closed this Oct 8, 2025
@chungjac chungjac deleted the autoMerge/feature/v2-to-v3-migration branch October 8, 2025 19:14
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.

7 participants