NotificationsYou must be signed in to change notification settings
Fork3.3k
Star14.5k

[automated] Merge branch 'release/8.0' => 'main'#31598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

1 commit merged intodotnet:mainfromdotnet-maestro-bot:merge/release/8.0-to-main

Aug 31, 2023

Merged

[automated] Merge branch 'release/8.0' => 'main'#31598

1 commit merged intodotnet:mainfromdotnet-maestro-bot:merge/release/8.0-to-main

Aug 31, 2023

Conversation

Copy link

Contributor

dotnet-maestro-bot commentedAug 31, 2023

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

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

AndriySvyryd

Instructions for merging from UI

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

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetchgit checkout release/8.0git pull --ff-onlygit checkout maingit pull --ff-onlygit merge --no-ff release/8.0# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge# Pushing the changes to the PR branch will re-trigger PR validation.git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do thisusing GitHub or using thecommand line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-to-main maingit pull https://github.com/dotnet-maestro-bot/EntityFrameworkCore merge/release/8.0-to-main(make changes)git commit -m "Updated PR with my changes"git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main

or if you are using SSH

git checkout -b merge/release/8.0-to-main maingit pull git@github.com:dotnet-maestro-bot/EntityFrameworkCore merge/release/8.0-to-main(make changes)git commit -m "Updated PR with my changes"git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-to-main

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

Don't exclude from migrations derived tables for TPT and TPC

6a9f143

Fixesdotnet#30079

ghost added area-infrastructure type-merge forward ⏩ labels

Aug 31, 2023

ghost approved these changes

Aug 31, 2023

View reviewed changes

Copy link

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-approving branch merge.

ghost added the auto-merge label

Aug 31, 2023

Copy link

ghost commentedAug 31, 2023

Hello @msftbot[bot]!

Because this pull request has theauto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn morehere.

Copy link

ghost commentedAug 31, 2023

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:

Azure Pipelines

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 atfabricbotservices@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.