-
Notifications
You must be signed in to change notification settings - Fork 6.8k
feat(cdk-experimental/selection): Merge cdk–selection to the master #20229
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
3b0c3fc
to
f11158c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
(this code has all been previously reviewed on the cdk-selection branch)
Caretaker note: we should fixup the commit messages while also preserving the individual comments |
Please rebase and then stick the "merge ready" label back on |
I resolved the conflicts in Github's UI and it seems it created a merge commit. It looks all good but let me know if you want me to do it in another way. I added back "merge ready", not sure about "commit message fixup" though. |
c37f2ad
to
3441c2d
Compare
Unfortunately our script isn't able to preserve commits while also needing to fix some up. I re-attempted your rebase and we should be good. Once the CI reports green then we can get this in |
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Merge the cdk-selection branch to the master branch #18581