Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.6 into release/dev16.6-vs-deps.

git fetch --all
git checkout merges/release/dev16.6-to-release/dev16.6-vs-deps
git reset --hard upstream/release/dev16.6-vs-deps
git merge upstream/release/dev16.6
# Fix merge conflicts
git commit
git push upstream merges/release/dev16.6-to-release/dev16.6-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

@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.6-to-release/dev16.6-vs-deps to 9e21d4d122de2078208b1fcad57c7a25315f1e1e

@dotnet-bot dotnet-bot requested a review from a team as a code owner April 8, 2020 19:57
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.6-to-release/dev16.6-vs-deps to 4e5a2294274109e2d93dce71eb6e94a46f992c58

@dotnet-bot dotnet-bot requested a review from a team as a code owner April 8, 2020 21:02
@JoeRobich JoeRobich force-pushed the merges/release/dev16.6-to-release/dev16.6-vs-deps branch from 4e5a229 to 9e21d4d Compare April 8, 2020 21:18
@JoeRobich JoeRobich added the Merge Conflicts There are merge conflicts with the base branch. label Apr 8, 2020
…itialize

Update color scheme on package initialization.
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.6-to-release/dev16.6-vs-deps to 007c46dcc29a29515291b5595df235b335d5ba70

@ghost ghost merged commit ed485ab into release/dev16.6-vs-deps Apr 9, 2020
@ghost ghost deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 9, 2020 06:05
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants