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

## Problem
Need to understand:
- How many users are using fix feature from /review (not auto-review)
- How many fixes were generated/applied for each scanJob
- How many code fix requests were unable to generate a fix

## Solution
- Add flag `autoDetected` to be able to filter out auto-review findings
- Add flag `includesFix` to be able to see fix requests that generated
no fixes
- Add `codewhispererCodeScanJobId` to associate a fix action with a
specific scan that produced the finding
@jpinkney-aws jpinkney-aws disabled auto-merge January 28, 2025 17:52
@jpinkney-aws jpinkney-aws merged commit beed965 into feature/amazonqLSP Jan 28, 2025
26 checks passed
@jpinkney-aws jpinkney-aws deleted the autoMerge/feature/amazonqLSP branch January 28, 2025 17:52
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.

3 participants