Skip to content

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'#1540

Merged
ViktorHofer merged 1 commit intorelease/10.0.2xxfrom
merge/release/10.0.1xx-to-release/10.0.2xx
Nov 24, 2025
Merged

[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'#1540
ViktorHofer merged 1 commit intorelease/10.0.2xxfrom
merge/release/10.0.1xx-to-release/10.0.2xx

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

This PR merges commits made on release/10.0.1xx by the following committers:

  • ViktorHofer

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/10.0.1xx
git pull --ff-only
git checkout release/10.0.2xx
git pull --ff-only
git merge --no-ff release/10.0.1xx

# 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/sourcelink HEAD:merge/release/10.0.1xx-to-release/10.0.2xx
or if you are using SSH
git push git@github.com:dotnet/sourcelink HEAD:merge/release/10.0.1xx-to-release/10.0.2xx

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/10.0.1xx-to-release/10.0.2xx'. 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/release/10.0.1xx-to-release/10.0.2xx origin/release/10.0.2xx
git pull https://github.com/dotnet/sourcelink merge/release/10.0.1xx-to-release/10.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sourcelink HEAD:merge/release/10.0.1xx-to-release/10.0.2xx
or if you are using SSH
git fetch
git checkout -b merge/release/10.0.1xx-to-release/10.0.2xx origin/release/10.0.2xx
git pull git@github.com:dotnet/sourcelink merge/release/10.0.1xx-to-release/10.0.2xx
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sourcelink HEAD:merge/release/10.0.1xx-to-release/10.0.2xx

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.

The OneLocBuild by default should only run on the main branch. If release branches need different localization, a separate package id needs to be created.
@ViktorHofer ViktorHofer merged commit a93ac70 into release/10.0.2xx Nov 24, 2025
10 checks passed
@ViktorHofer ViktorHofer deleted the merge/release/10.0.1xx-to-release/10.0.2xx branch November 24, 2025 19:24
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.

1 participant