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-preview6' => 'release/8.0' #3712

Conversation

dotnet-maestro-bot
Copy link

@dotnet-maestro-bot dotnet-maestro-bot commented Apr 15, 2024

I detected changes in the release/8.0-preview6 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-preview6 by the following committers:

  • github-actions[bot]
  • joperezr

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

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

Microsoft Reviewers: Open in CodeFlow

@dotnet-issue-labeler dotnet-issue-labeler bot added the area-codeflow for labeling automated codeflow. intentionally a different color! label Apr 15, 2024
@dotnet-policy-service dotnet-policy-service bot added the Servicing-consider Issue for next servicing release review label Apr 15, 2024
@joperezr joperezr self-assigned this Apr 15, 2024
@joperezr joperezr enabled auto-merge April 15, 2024 20:22
@joperezr joperezr added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Apr 15, 2024
@joperezr
Copy link
Member

Marking as servicing-approved, as this is code-flow and doesn't actually have any changes in it.

@joperezr joperezr disabled auto-merge April 15, 2024 21:36
@joperezr joperezr merged commit 0634fcd into dotnet:release/8.0 Apr 15, 2024
8 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators May 17, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow. intentionally a different color! Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants