FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[automated] Merge branch 'release/8.0' => 'main' by dotnet-maestro-bot · Pull Request #31575 · dotnet/efcore · GitHub

  1. dotnet
  2. efcore

Repository navigation

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

Merged
5 commits merged into
dotnet:mainfrom
dotnet-maestro-bot:merge/release/8.0-to-main
Aug 28, 2023
ConversationCommits (5)ChecksFiles changed
Merged

[automated] Merge branch 'release/8.0' => 'main'#31575
5 commits merged into
dotnet:mainfrom
dotnet-maestro-bot:merge/release/8.0-to-main

Conversation

dotnet-maestro-bot commented Aug 28, 2023

Copy link
Copy Markdown
Contributor

I detected changes in the release/8.0 branch which have not been merged yet to main. I'm a robot and am configured 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:

  • smnsht
  • dotnet-maestro[bot]

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 fetch
git checkout release/8.0
git pull --ff-only
git checkout main
git pull --ff-only
git 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 this using GitHub or using the command 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 main
git 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 main
git 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. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

dotnet-maestro Bot and others added 4 commits August 24, 2023 16:33
Update dependencies from https://github.com/dotnet/runtime build 2023…
afef2e5 
…0823.11 (dotnet#31543)

[release/8.0] Update dependencies from dotnet/runtime
Update dependencies from https://github.com/dotnet/runtime build 2023…
e1eb9a6 
…0825.9 (dotnet#31557)

[release/8.0] Update dependencies from dotnet/runtime
Update dependencies from https://github.com/dotnet/runtime build 2023…
1e26609 
…0826.4 (dotnet#31561)

[release/8.0] Update dependencies from dotnet/runtime
31355: SQLite: Add EF.Functions.Unhex (dotnet#31454)
affd440 
Fixes dotnet#31355

Co-authored-by: Brice Lambson <brice@bricelam.net>
ghost approved these changes Aug 28, 2023
View reviewed changes

ghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Auto-approving branch merge.

ghost added the auto-merge label Aug 28, 2023

ghost commented Aug 28, 2023

Copy link
Copy Markdown

Hello @msftbot[bot]!

Because this pull request has the auto-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 more here.

ghost commented Aug 28, 2023

Copy link
Copy Markdown

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. GitHub Actions

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.

1 similar comment

ghost commented Aug 28, 2023

Copy link
Copy Markdown

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. GitHub Actions

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.

ghost commented Aug 28, 2023

Copy link
Copy Markdown

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

ghost merged commit 24efb9c into dotnet:main Aug 28, 2023
This was referenced Jul 23, 2025
Closed
Closed
Closed
Closed
Closed
Open
Merged
Merged
Closed
Closed
Closed
Closed
This was referenced Jul 30, 2025
Closed
Closed
Closed
This was referenced Oct 22, 2026
Open
Open
Closed
Open
Open
Open
Closed
Open
Closed
Open
Merged
Open
Open
Closed
Open
Open
Open
Open
Open
Open
Merged
Merged
Closed
Open
Closed
Open
Closed
Open
Open
Open
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

wtgodbe Awaiting requested review from wtgodbe wtgodbe is a code owner
1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-infrastructure type-merge forward ⏩

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL