Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from master into master-vs-deps.

git fetch --all
git checkout merges/master-to-master-vs-deps
git reset --hard upstream/master-vs-deps
git merge upstream/master
# Fix merge conflicts
git commit
git push upstream merges/master-to-master-vs-deps --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 a9aa1e2 into master-vs-deps Jun 3, 2020
@ghost ghost deleted the merges/master-to-master-vs-deps branch June 3, 2020 10:27
@dotnet-bot dotnet-bot restored the merges/master-to-master-vs-deps branch June 3, 2020 12:02
@dotnet-bot dotnet-bot deleted the merges/master-to-master-vs-deps branch June 3, 2020 12:02
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.

3 participants