Skip to content

Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps#24634

Merged
AbhitejJohn merged 12 commits intodev15.7.x-vs-depsfrom
merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180205-080011
Feb 5, 2018
Merged

Merge dev15.6.x-vs-deps to dev15.7.x-vs-deps#24634
AbhitejJohn merged 12 commits intodev15.7.x-vs-depsfrom
merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180205-080011

Conversation

@dotnet-bot
Copy link
Copy Markdown
Collaborator

This is an automatically generated pull request from dev15.6.x-vs-deps into dev15.7.x-vs-deps.

git fetch --all
git checkout merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180205-080011
git reset --hard upstream/dev15.7.x-vs-deps
git merge upstream/dev15.6.x-vs-deps
# Fix merge conflicts
git commit
git push merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180205-080011 --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 February 5, 2018 08:00
@AbhitejJohn AbhitejJohn merged commit f0979bc into dev15.7.x-vs-deps Feb 5, 2018
@AbhitejJohn AbhitejJohn deleted the merges/dev15.6.x-vs-deps-to-dev15.7.x-vs-deps-20180205-080011 branch February 5, 2018 23:28
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