Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

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

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

…-to-release/dev16.7-preview2-vs-deps

Merge release/dev16.7-preview2 to release/dev16.7-preview2-vs-deps
@dotnet-bot dotnet-bot requested a review from a team as a code owner May 30, 2020 06:01
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels May 30, 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

…ps' into merges/release/dev16.7-preview2-vs-deps-to-master-vs-deps
@RikkiGibson RikkiGibson removed the Merge Conflicts There are merge conflicts with the base branch. label May 30, 2020
@ghost ghost merged commit a42e17b into master-vs-deps Jun 2, 2020
@ghost ghost deleted the merges/release/dev16.7-preview2-vs-deps-to-master-vs-deps branch June 2, 2020 22:26
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