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 'production' => 'main' #2741

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

dotnet-maestro-bot
Copy link
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.

@premun premun merged commit 1afc2b6 into dotnet:main Jul 12, 2023
@MilenaHristova MilenaHristova mentioned this pull request Jul 17, 2023
20 tasks
@andriipatsula andriipatsula mentioned this pull request Jul 24, 2023
20 tasks
@tkapin tkapin mentioned this pull request Jul 31, 2023
20 tasks
@MilenaHristova MilenaHristova mentioned this pull request Aug 7, 2023
20 tasks
@premun premun mentioned this pull request Aug 15, 2023
20 tasks
@MilenaHristova MilenaHristova mentioned this pull request Aug 21, 2023
20 tasks
@premun premun mentioned this pull request Aug 28, 2023
20 tasks
@dkurepa dkurepa mentioned this pull request Sep 5, 2023
20 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Sep 11, 2023
20 tasks
@andriipatsula andriipatsula mentioned this pull request Sep 19, 2023
20 tasks
@premun premun mentioned this pull request Sep 25, 2023
20 tasks
@MilenaHristova MilenaHristova mentioned this pull request Oct 2, 2023
20 tasks
@dkurepa dkurepa mentioned this pull request Oct 10, 2023
20 tasks
@andriipatsula andriipatsula mentioned this pull request Oct 16, 2023
20 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Oct 23, 2023
20 tasks
@MilenaHristova MilenaHristova mentioned this pull request Oct 30, 2023
20 tasks
@dkurepa dkurepa mentioned this pull request Nov 6, 2023
20 tasks
@premun premun mentioned this pull request Nov 13, 2023
20 tasks
@andriipatsula andriipatsula mentioned this pull request Nov 20, 2023
20 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Nov 27, 2023
20 tasks
@dkurepa dkurepa mentioned this pull request Dec 4, 2023
20 tasks
@MilenaHristova MilenaHristova mentioned this pull request Dec 12, 2023
20 tasks
@premun premun mentioned this pull request Dec 18, 2023
20 tasks
@MilenaHristova MilenaHristova mentioned this pull request Jan 2, 2024
20 tasks
@andriipatsula andriipatsula mentioned this pull request Jan 8, 2024
20 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Aug 26, 2024
17 tasks
@dkurepa dkurepa mentioned this pull request Sep 4, 2024
17 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Sep 9, 2024
17 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Sep 18, 2024
17 tasks
@MilenaHristova MilenaHristova mentioned this pull request Sep 23, 2024
17 tasks
@dkurepa dkurepa mentioned this pull request Oct 2, 2024
17 tasks
@pavel-purma pavel-purma mentioned this pull request Oct 10, 2024
17 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Oct 16, 2024
17 tasks
This was referenced Oct 21, 2024
@oleksandr-didyk oleksandr-didyk mentioned this pull request Oct 29, 2024
17 tasks
@dkurepa dkurepa mentioned this pull request Nov 5, 2024
17 tasks
@MilenaHristova MilenaHristova mentioned this pull request Nov 12, 2024
17 tasks
@pavel-purma pavel-purma mentioned this pull request Nov 25, 2024
17 tasks
@dkurepa dkurepa mentioned this pull request Dec 3, 2024
17 tasks
This was referenced Dec 9, 2024
@dkurepa dkurepa mentioned this pull request Dec 30, 2024
17 tasks
This was referenced Jan 2, 2025
@premun premun mentioned this pull request Jan 10, 2025
13 tasks
@oleksandr-didyk oleksandr-didyk mentioned this pull request Jan 14, 2025
11 tasks
@pavel-purma pavel-purma mentioned this pull request Jan 20, 2025
11 tasks
@premun premun mentioned this pull request Jan 22, 2025
11 tasks
This was referenced Jan 27, 2025
@premun premun mentioned this pull request Feb 5, 2025
11 tasks
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