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

## Problem:

If a user has not selected Q Developer Profile after signing in, their
features will not work.

Some existing users, before the introduction of Q Developer Profiles,
who were already signed in had their features stop working because they
didn't select a profile.

## Solution:

On startup if we detect the user did not select a profile, then send a
warning message that their features will not work until they select one.
The message will have a button to allow them to select a profile through
quickpick, or entirly ignore the message and not show it again.

<img width="753" alt="Screenshot 2025-04-24 at 5 42 51 PM"
src="https://github.com/user-attachments/assets/2429badf-8131-48f8-9ba9-ea81423c9c60"
/>



---

- 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.

---------

Signed-off-by: nkomonen-amazon <[email protected]>
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners April 25, 2025 16:24
@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 2 commits April 25, 2025 12:48
## Problem
If we want to log a large json object with giant strings (think whole
files), it can make the logs difficult to read. This is especially
relevant when the underlying string values are not very important.

## Solution
- allow the string values to be truncated with `maxStringLength` option.

## Notes
I am planning to port this utility to Flare to improve the logging
experience there, and want this functionality to exist there however I
thought this could be useful here too.

---

- 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.
@justinmk3
Copy link
Contributor

/retrybuild

@nkomonen-amazon
Copy link
Contributor

nkomonen-amazon commented Apr 25, 2025

/retryBuilds

@nkomonen-amazon nkomonen-amazon merged commit be976e1 into feature/hybridChat Apr 25, 2025
19 of 22 checks passed
@nkomonen-amazon nkomonen-amazon deleted the autoMerge/feature/hybridChat branch April 25, 2025 18:58
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