Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' #31473

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

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

  • roji

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.

merge button instructions

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-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc1

# 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-rc1-to-release/8.0
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-rc1-to-release/8.0

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-rc1-to-release/8.0'. 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-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/EntityFrameworkCore merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull git@github.com:dotnet-maestro-bot/EntityFrameworkCore merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/8.0-rc1-to-release/8.0

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.

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

@ghost ghost added the auto-merge label Aug 15, 2023
@ghost
Copy link

ghost commented Aug 15, 2023

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
Copy link

ghost commented Aug 15, 2023

Apologies, while this PR appears ready to be merged, it looks like release/8.0 is a protected branch and I have not been granted permission to perform the merge.

3 similar comments
@ghost
Copy link

ghost commented Aug 15, 2023

Apologies, while this PR appears ready to be merged, it looks like release/8.0 is a protected branch and I have not been granted permission to perform the merge.

@ghost
Copy link

ghost commented Aug 15, 2023

Apologies, while this PR appears ready to be merged, it looks like release/8.0 is a protected branch and I have not been granted permission to perform the merge.

@ghost
Copy link

ghost commented Aug 15, 2023

Apologies, while this PR appears ready to be merged, it looks like release/8.0 is a protected branch and I have not been granted permission to perform the merge.

@Tratcher Tratcher merged commit d9ac1ff into dotnet:release/8.0 Aug 15, 2023
@Tratcher
Copy link
Member

Woops, @wtgodbe, that shouldn't have been a Squash-and-merge, right? Is that going to break anything?

@wtgodbe
Copy link
Member

wtgodbe commented Aug 15, 2023

It should be fine in this case since there was only 1 commit in the PR. Doing a merge-commit matters most when we're doing the internal->public merge, since those PRs contain the actual commit we're going to tag for a release

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.

4 participants