Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev16.0-vs-deps to master-vs-deps #33838

Merged
merged 14 commits into from Mar 4, 2019

Conversation

Projects
None yet
3 participants
@dotnet-bot
Copy link
Collaborator

dotnet-bot commented Mar 4, 2019

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

git fetch --all
git checkout merges/dev16.0-vs-deps-to-master-vs-deps
git reset --hard upstream/master-vs-deps
git merge upstream/dev16.0-vs-deps
# Fix merge conflicts
git commit
git push upstream merges/dev16.0-vs-deps-to-master-vs-deps --force

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

sharwell added some commits Mar 1, 2019

Revert "Merge pull request #33800 from sharwell/script-cleanup"
This reverts commit 726c2bc, reversing
changes made to f51b549.
Merge pull request #33832 from sharwell/revert-exec-command
Revert "Merge pull request #33800 from sharwell/script-cleanup"

@dotnet-bot dotnet-bot requested a review from dotnet/roslyn-ide as a code owner Mar 4, 2019

@dotnet-automerge-bot
Copy link
Collaborator

dotnet-automerge-bot left a comment

Auto-approval

@dotnet-automerge-bot dotnet-automerge-bot merged commit c32ec29 into master-vs-deps Mar 4, 2019

1 check passed

license/cla All CLA requirements met.
Details

@dotnet-automerge-bot dotnet-automerge-bot deleted the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 4, 2019

@dotnet-bot dotnet-bot restored the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 4, 2019

@dotnet-bot dotnet-bot deleted the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 4, 2019

@dotnet-bot dotnet-bot restored the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 5, 2019

@dotnet-bot dotnet-bot deleted the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 5, 2019

@dotnet-bot dotnet-bot restored the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 5, 2019

@dotnet-bot dotnet-bot deleted the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 5, 2019

@dotnet-bot dotnet-bot restored the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 6, 2019

@dotnet-bot dotnet-bot deleted the merges/dev16.0-vs-deps-to-master-vs-deps branch Mar 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.