Skip to content

Merge master to features/module-initializers#45646

Merged
2 commits merged intofeatures/module-initializersfrom
merges/master-to-features/module-initializers
Jul 4, 2020
Merged

Merge master to features/module-initializers#45646
2 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.

@dotnet-bot dotnet-bot requested a review from a team as a code owner July 4, 2020 00:02
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Jul 4, 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 a2acd33 into features/module-initializers Jul 4, 2020
@ghost ghost deleted the merges/master-to-features/module-initializers branch July 4, 2020 17:58
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.

3 participants