Skip to content
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

Merge master to dev16.0 #6019

Merged
5 commits merged into from
Dec 17, 2018
Merged

Merge master to dev16.0 #6019

5 commits merged into from
Dec 17, 2018

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from master into dev16.0.

git fetch --all
git checkout merges/master-to-dev16.0
git reset --hard upstream/dev16.0
git merge upstream/master
# Fix merge conflicts
git commit
git push merges/master-to-dev16.0 --force

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

@KevinRansom
Copy link
Member

@TIHan, can you take care of your merge issues please.

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 b4abd96 into dev16.0 Dec 17, 2018
@ghost ghost deleted the merges/master-to-dev16.0 branch December 17, 2018 20:30
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants