Skip to content

Merge dev15.6.x to dev15.7.x#24633

Merged
AbhitejJohn merged 11 commits intodev15.7.xfrom
merges/dev15.6.x-to-dev15.7.x-20180205-080009
Feb 5, 2018
Merged

Merge dev15.6.x to dev15.7.x#24633
AbhitejJohn merged 11 commits intodev15.7.xfrom
merges/dev15.6.x-to-dev15.7.x-20180205-080009

Conversation

@dotnet-bot
Copy link
Collaborator

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

git fetch --all
git checkout merges/dev15.6.x-to-dev15.7.x-20180205-080009
git reset --hard upstream/dev15.7.x
git merge upstream/dev15.6.x
# Fix merge conflicts
git commit
git push merges/dev15.6.x-to-dev15.7.x-20180205-080009 --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 ac3739b into dev15.7.x Feb 5, 2018
@AbhitejJohn AbhitejJohn deleted the merges/dev15.6.x-to-dev15.7.x-20180205-080009 branch February 5, 2018 23:30
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.

5 participants