Skip to content

Merge release/dev16.7 to master#45555

Merged
dibarbet merged 6 commits intomasterfrom
merges/release/dev16.7-to-master
Jun 30, 2020
Merged

Merge release/dev16.7 to master#45555
dibarbet merged 6 commits intomasterfrom
merges/release/dev16.7-to-master

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.

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

Allow independent methods to have the same parameter name
@dotnet-bot
Copy link
Collaborator Author

Reset HEAD of merges/release/dev16.7-to-master to ca3c46b7a2d18f90e1e817d843ec0963604295c1

@ghost
Copy link

ghost commented Jun 30, 2020

Apologies, while this PR appears ready to be merged, I've been configured to only merge when all checks have explicitly passed. The following integrations have not reported any progress on their checks and are blocking auto-merge:

  1. DotNet Maestro - Int
  2. DotNet Maestro

These integrations are possibly never going to report a check, and unblocking auto-merge likely requires a human being to update my configuration to exempt these integrations from requiring a passing check.

Give feedback on this
From the bot dev team

We've tried to tune the bot such that it posts a comment like this only when auto-merge is blocked for exceptional, non-intuitive reasons. When the bot's auto-merge capability is properly configured, auto-merge should operate as you would intuitively expect and you should not see any spurious comments.

Please reach out to us at fabricbotservices@microsoft.com to provide feedback if you believe you're seeing this comment appear spuriously. Please note that we usually are unable to update your bot configuration on your team's behalf, but we're happy to help you identify your bot admin.

@dibarbet dibarbet merged commit 83e13e1 into master Jun 30, 2020
@ghost ghost added this to the Next milestone Jun 30, 2020
@dotnet-bot dotnet-bot deleted the merges/release/dev16.7-to-master branch June 30, 2020 09:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.7-to-master branch June 30, 2020 12:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.7-to-master branch June 30, 2020 12:01
@dotnet-bot dotnet-bot restored the merges/release/dev16.7-to-master branch June 30, 2020 15:01
@dotnet-bot dotnet-bot deleted the merges/release/dev16.7-to-master branch June 30, 2020 15:01
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants