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/agentic-chat
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/agentic-chat

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner March 28, 2025 20:09
justinmk3 and others added 4 commits March 28, 2025 13:29
## Problem
The API model is out of date.

## Solution

Update API model.

This is done by copying
aws-sdk-external-2022-11-11/c2j/codewhispererruntime-2022-11-11.normal.json
and then format it using prettier plugin in VS Code. By doing so, the
format of the JSON matches the one in the repo.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner March 28, 2025 21:13
@github-actions
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

Hweinstock and others added 12 commits March 28, 2025 15:02
## Problem
This client is used in many Q features and does not currently allow
retries. This means a single SDK request failure will cause the
operation to fail.

It appears based on the code that this is not intentional, and was
accidentally left unfinished.

## Solution
- allow up to 1 retry.
feat(chat): Add ListDirectory tool
fix(chat): fsRead doesn't show readRange
fix(chat): file links open in other apps
@ctlai95 ctlai95 requested a review from a team as a code owner March 29, 2025 06:25
@justinmk3 justinmk3 merged commit 10bb1c7 into feature/agentic-chat Mar 31, 2025
30 of 31 checks passed
@justinmk3 justinmk3 deleted the autoMerge/feature/agentic-chat branch March 31, 2025 15:46
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