Skip to content

Conversation

@dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from release/dev16.7 into master.

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

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

@dotnet-bot dotnet-bot requested review from a team as code owners July 15, 2020 21:01
@dotnet-bot dotnet-bot force-pushed the merges/release/dev16.7-to-master branch from b6b6ad7 to b86742c Compare July 15, 2020 21:01
@dotnet-bot dotnet-bot added Area-Infrastructure auto-merge Merge Conflicts There are merge conflicts with the base branch. labels Jul 15, 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

@JoeRobich JoeRobich closed this Jul 16, 2020
@JoeRobich JoeRobich reopened this Jul 16, 2020
@JoeRobich
Copy link
Member

Integration CI is passing despite the GH check not updating https://dev.azure.com/dnceng/public/_build/results?buildId=732693&view=results

@JoeRobich
Copy link
Member

Everything is passing but integration check never updated as green. merging

@JoeRobich JoeRobich merged commit 957fd49 into master Jul 16, 2020
@ghost ghost added this to the Next milestone Jul 16, 2020
@JoeRobich JoeRobich modified the milestones: Next, 16.8.P1 Jul 20, 2020
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