-
Notifications
You must be signed in to change notification settings - Fork 80
Commit 26cbf2d
authored
[automated] Merge branch 'production' => 'main' (#4875)
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:
* @premun
## 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.
<img alt="merge button instructions"
src="https://i.imgur.com/GepcNJV.png" width="300" />
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.
``` sh
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/arcade-services HEAD:merge/production-to-main
```
<details>
<summary>or if you are using SSH</summary>
```
git push git@github.com:dotnet/arcade-services HEAD:merge/production-to-main
```
</details>
After PR checks are complete push the branch
```
git push
```
## Instructions for resolving conflicts
:warning: If there are merge conflicts, you will need to resolve them
manually before merging. You can do this [using GitHub][resolve-github]
or using the [command line][resolve-cli].
[resolve-github]:
https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]:
https://help.github.com/articles/resolving-a-merge-conflict-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.
The provided examples assume that the remote is named 'origin'. If you
have a different remote name, please replace 'origin' with the name of
your remote.
```
git fetch
git checkout -b merge/production-to-main origin/main
git pull https://github.com/dotnet/arcade-services merge/production-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/arcade-services HEAD:merge/production-to-main
```
<details>
<summary>or if you are using SSH</summary>
```
git fetch
git checkout -b merge/production-to-main origin/main
git pull git@github.com:dotnet/arcade-services merge/production-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/arcade-services HEAD:merge/production-to-main
```
</details>
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or
issues.
Also, if this PR was generated incorrectly, help us fix it. See
https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.File tree
Expand file treeCollapse file tree
0 file changed
+0
-0
lines changedFilter options
Expand file treeCollapse file tree
0 file changed
+0
-0
lines changed
0 commit comments