Skip to content

[automated] Merge branch 'production' => 'main'#2723

Merged
premun merged 5 commits intodotnet:mainfrom
dotnet-maestro-bot:merge/production-to-main
Jun 28, 2023
Merged

[automated] Merge branch 'production' => 'main'#2723
premun merged 5 commits intodotnet:mainfrom
dotnet-maestro-bot:merge/production-to-main

Conversation

@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor

I detected changes in the production 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 production by the following committers:

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 production
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff production

# 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/arcade-services HEAD:merge/production-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/arcade-services HEAD:merge/production-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/production-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/production-to-main main
git pull https://github.com/dotnet-maestro-bot/arcade-services merge/production-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/arcade-services HEAD:merge/production-to-main
or if you are using SSH
git checkout -b merge/production-to-main main
git pull git@github.com:dotnet-maestro-bot/arcade-services merge/production-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/arcade-services HEAD:merge/production-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 dotnet-maestro-bot force-pushed the merge/production-to-main branch from 255f50e to 3fe5f60 Compare June 28, 2023 09:54
Copy link
Copy Markdown
Member

@premun premun left a comment

Choose a reason for hiding this comment

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

The changes here match the hotfix done in 3fe5f60

@premun premun merged commit fb5d461 into dotnet:main Jun 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants