Commit 9c36413
Merge master into feature/ui-e2e-tests (aws#7680)
## 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/ui-e2e-tests
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/ui-e2e-tests
```
---------
Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: 🥩 Flora <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: Laxman Reddy <[email protected]>
Co-authored-by: Roger Zhang <[email protected]>
Co-authored-by: Jacob Chung <[email protected]>
Co-authored-by: aws-asolidu <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: Newton Der <[email protected]>
Co-authored-by: aws-toolkit-automation <>
Co-authored-by: laura-codess <[email protected]>
Co-authored-by: Tyrone Smith <[email protected]>
Co-authored-by: Aidan Ton <[email protected]>
Co-authored-by: abhraina-aws <[email protected]>
Co-authored-by: atontb <[email protected]>
Co-authored-by: Nitish <[email protected]>
Co-authored-by: Nitish Kumar Singh <[email protected]>
Co-authored-by: Blake Lazarine <[email protected]>
Co-authored-by: mkovelam <[email protected]>
Co-authored-by: BlakeLazarine <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Na Yue <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: tsmithsz <[email protected]>
Co-authored-by: Reed Hamilton <[email protected]>
Co-authored-by: surajrdy-aws <[email protected]>
Co-authored-by: Boyu <[email protected]>
Co-authored-by: Dung Dong <[email protected]>1 parent 4f716c1 commit 9c36413
File tree
154 files changed
+8416
-7334
lines changed- packages
- amazonq
- .changes
- next-release
- src
- app
- chat/node
- inline
- EditRendering
- lsp
- chat
- test
- e2e/amazonq
- unit
- amazonq
- apps/inline
- lsp
- app/inline/EditRendering
- codewhisperer/service
- core
- resources
- src
- amazonqDoc
- amazonqFeatureDev
- amazonqTest
- chat
- controller
- messenger
- session
- storages
- views
- actions
- connector
- models
- amazonq
- webview/ui
- apps
- followUps
- messages
- quickActions
- storages
- tabs
- auth
- awsService
- appBuilder
- explorer/nodes
- sagemaker
- detached-server
- routes
- explorer
- codewhisperer
- commands
- models
- region
- service
- util
- lambda
- commands
- explorer
- models
- remoteDebugging
- vue/remoteInvoke
- test
- auth
- awsService/sagemaker
- detached-server
- routes
- explorer
- codewhisperer
- credentials
- lambda
- commands
- explorer
- remoteDebugging
- vue/remoteInvoke
- toolkit
- .changes
- next-release
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
154 files changed
+8416
-7334
lines changedThis file was deleted.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
Lines changed: 0 additions & 4 deletions
This file was deleted.
0 commit comments