Skip to content

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

Merged
merged 4 commits into from
Aug 14, 2020

Conversation

yifange
Copy link
Contributor

@yifange yifange commented Aug 6, 2020

Merge the cdk-selection branch to the master branch #18581

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Aug 6, 2020
@yifange yifange force-pushed the cdk-selection-merge branch 4 times, most recently from 3b0c3fc to f11158c Compare August 7, 2020 05:03
@yifange yifange requested a review from jelbourn August 7, 2020 16:53
@yifange yifange marked this pull request as ready for review August 7, 2020 16:53
Copy link
Member

@jelbourn jelbourn left a 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)

@jelbourn jelbourn added action: merge The PR is ready for merge by the caretaker merge safe target: minor This PR is targeted for the next minor release merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note merge: fix commit message When the PR is merged, rewrites/fixups of the commit messages are needed merge: preserve commits When the PR is merged, a rebase and merge should be performed labels Aug 7, 2020
@jelbourn
Copy link
Member

jelbourn commented Aug 7, 2020

Caretaker note: we should fixup the commit messages while also preserving the individual comments

@andrewseguin andrewseguin added needs rebase and removed merge: fix commit message When the PR is merged, rewrites/fixups of the commit messages are needed action: merge The PR is ready for merge by the caretaker labels Aug 12, 2020
@andrewseguin
Copy link
Contributor

Please rebase and then stick the "merge ready" label back on

@yifange yifange added the action: merge The PR is ready for merge by the caretaker label Aug 12, 2020
@yifange
Copy link
Contributor Author

yifange commented Aug 12, 2020

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.

@andrewseguin andrewseguin removed the merge: preserve commits When the PR is merged, a rebase and merge should be performed label Aug 13, 2020
@andrewseguin
Copy link
Contributor

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

@andrewseguin andrewseguin merged commit ebb3998 into angular:master Aug 14, 2020
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement merge: caretaker note Alert the caretaker performing the merge to check the PR for an out of normal action needed or note target: minor This PR is targeted for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants