Skip to content

Merge master to dev16.1#6470

Merged
brettfo merged 10 commits intodev16.1from
merges/master-to-dev16.1
Apr 9, 2019
Merged

Merge master to dev16.1#6470
brettfo merged 10 commits intodev16.1from
merges/master-to-dev16.1

Conversation

@dotnet-bot
Copy link
Copy Markdown
Contributor

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

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

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

@brettfo
Copy link
Copy Markdown
Member

brettfo commented Apr 9, 2019

@brettfo brettfo merged commit b7e7b53 into dev16.1 Apr 9, 2019
@brettfo brettfo deleted the merges/master-to-dev16.1 branch April 9, 2019 23:52
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.

4 participants