search

aspnet / Diagnostics

[Archived] Diagnostics middleware for reporting info and handling exceptions and errors in ASP.NET Core, and diagnosing Entity Framework Core migrations errors. Project moved to https://github.com/aspnet/AspNetCore
Apache License 2.0
213 stars 108 forks source link

[automated] Merge branch 'release/2.2' => 'master' #488

Closed dotnet-maestro-bot closed 6 years ago

dotnet-maestro-bot commented 6 years ago

I detected changes in the release/2.2 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.

This PR merges commits made on release/2.2 by the following committers:

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

You can also do this on command line:

git checkout master
git pull
git fetch --force https://github.com/dotnet-maestro-bot/Diagnostics merge/release/2.2-to-master:merge/release/2.2-to-master
git merge merge/release/2.2-to-master
git push

Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Maintainers of this repo have permission to the branch 'merge/release/2.2-to-master' on https://github.com/dotnet-maestro-bot/Diagnostics. You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt to update this branch as more changes are discovered on release/2.2.

Please contact .NET Core Engineering if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-maestro-bot commented 6 years ago

:x: Uh oh, this pull request could not be updated automatically. New commits were pushed to release/2.2, but I could not automatically push those to merge/release/2.2-to-master to update this PR. You may need to fix this problem by merging branches with this PR. Contact .NET Core Engineering if you are not sure what to do about this.