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.

@dotnet-bot dotnet-bot requested a review from a team as a code owner April 10, 2020 18:02
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Apr 10, 2020
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 3375a7b into release/dev16.6-vs-deps Apr 13, 2020
@ghost ghost deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 13, 2020 19:41
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 13, 2020 21:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 13, 2020 21:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 00:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 00:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 02:28
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 02:28
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 03:04
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 03:04
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 06:02
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 06:02
@dotnet-bot dotnet-bot restored the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 2020 09:05
@dotnet-bot dotnet-bot deleted the merges/release/dev16.6-to-release/dev16.6-vs-deps branch April 14, 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

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.

3 participants