Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into features/embeddedJson.

git fetch --all
git checkout merges/master-to-features/embeddedJson
git reset --hard upstream/features/embeddedJson
git merge upstream/master
# Fix merge conflicts
git commit
git push merges/master-to-features/embeddedJson --force

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

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 c666d1e into features/embeddedJson Jun 5, 2018
@ghost ghost deleted the merges/master-to-features/embeddedJson branch June 5, 2018 17:30
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 5, 2018 18:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 5, 2018 19:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 5, 2018 20:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 5, 2018 20:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 5, 2018 21:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 5, 2018 21:00
@dotnet-bot dotnet-bot restored the merges/master-to-features/embeddedJson branch June 5, 2018 22:00
@dotnet-bot dotnet-bot deleted the merges/master-to-features/embeddedJson branch June 5, 2018 22:00
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants