Skip to content

Merge dev15.6.x to dev15.6.x-vs-deps#24620

Merged
jasonmalinowski merged 11 commits intodev15.6.x-vs-depsfrom
merges/dev15.6.x-to-dev15.6.x-vs-deps-20180202
Feb 4, 2018
Merged

Merge dev15.6.x to dev15.6.x-vs-deps#24620
jasonmalinowski merged 11 commits intodev15.6.x-vs-depsfrom
merges/dev15.6.x-to-dev15.6.x-vs-deps-20180202

Conversation

@natidea
Copy link
Copy Markdown
Contributor

@natidea natidea commented Feb 3, 2018

This is a pull request from dev15.6.x into dev15.6.x-vs-deps.

git fetch --all
git checkout merges/dev15.6.x-to-dev15.6.x-vs-deps-20180202
git reset --hard upstream/dev15.6.x-vs-deps
git merge upstream/dev15.6.x
# Fix merge conflicts
git commit
git push merges/dev15.6.x-to-dev15.6.x-vs-deps-20180202 --force

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

@natidea natidea requested a review from a team as a code owner February 3, 2018 03:17
@jasonmalinowski
Copy link
Copy Markdown
Member

@dotnet-bot retest windows_debug_unit32_prtest please.

@jasonmalinowski
Copy link
Copy Markdown
Member

@dotnet-bot retest ubuntu_16_debug_prtest please.

@natidea
Copy link
Copy Markdown
Contributor Author

natidea commented Feb 3, 2018

All green. Could I have one review to unblock the merge button? @jasonmalinowski @agocke

@jasonmalinowski jasonmalinowski merged commit 790b777 into dev15.6.x-vs-deps Feb 4, 2018
@jasonmalinowski jasonmalinowski deleted the merges/dev15.6.x-to-dev15.6.x-vs-deps-20180202 branch February 4, 2018 01:44
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.

6 participants