Skip to content

Merge master to master-vs-deps#45278

Merged
70 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps
Jun 19, 2020
Merged

Merge master to master-vs-deps#45278
70 commits merged intomaster-vs-depsfrom
merges/master-to-master-vs-deps

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into master-vs-deps.

git fetch --all
git checkout merges/master-to-master-vs-deps
git reset --hard upstream/master-vs-deps
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-master-vs-deps --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

Use ArrayBuilders instead of Lists in more places.
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 697e6309ab78bd0e36e537cb1be93bdc23af9125

@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 7647f552c8afcdc303a32e1b71c80c194a0ea73b

@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/master-to-master-vs-deps to 472c07233ad56ac7abe4670ebc7a3bc2122198fb

@dotnet-bot dotnet-bot requested a review from a team as a code owner June 18, 2020 21:02
@RikkiGibson RikkiGibson mentioned this pull request Jun 18, 2020
@ghost ghost merged commit eff93a5 into master-vs-deps Jun 19, 2020
@ghost ghost deleted the merges/master-to-master-vs-deps branch June 19, 2020 01:50
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants