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

There is not sufficient logging around the developer profile fetching logic in the login flow. This change adds more logging. In addition, unnecessary restrictive validation checks on the stored and returned Q developer profiles has been removed as we want to rely on the backend to give us valid results. Only validation to check the shape of the stored value is now used, if it is incorrect, we expect further calls to the backend to fail with an appropriate message.
Bumps version to 2.3.2.
@aws-toolkit-automation aws-toolkit-automation merged commit d7ad658 into feature/mcpAndModelSelection Aug 13, 2025
6 checks passed
@aws-toolkit-automation aws-toolkit-automation deleted the autoMerge/feature/mcpAndModelSelection branch August 13, 2025 00:09
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.

2 participants