Skip to content

Merge master to features/module-initializers#45271

Merged
144 commits merged intofeatures/module-initializersfrom
merges/master-to-features/module-initializers
Jun 18, 2020
Merged

Merge master to features/module-initializers#45271
144 commits merged intofeatures/module-initializersfrom
merges/master-to-features/module-initializers

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/module-initializers.

git fetch --all
git checkout merges/master-to-features/module-initializers
git reset --hard upstream/features/module-initializers
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-features/module-initializers --force

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

dibarbet and others added 18 commits June 15, 2020 12:46
Only send relevant completion resolve parameters
…nces-for-built-in-operators

Don't generate references for built-in operators
Fix crash in 'replace property with methods' when updating object initializers
@dotnet-bot dotnet-bot requested review from a team as code owners June 18, 2020 00:03
@dotnet-bot dotnet-bot requested a review from a team June 18, 2020 00:03
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Jun 18, 2020
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

@ghost ghost merged commit ae703fe into features/module-initializers Jun 18, 2020
@ghost ghost deleted the merges/master-to-features/module-initializers branch June 18, 2020 19:01
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.