Skip to content

Conversation

@github-actions
Copy link
Contributor

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

  • dsplaisted
  • invalid-email-address
  • Youssef1313
  • SimonZhao888
  • dotnet-maestro[bot]

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

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.

@github-actions github-actions bot requested a review from a team as a code owner August 26, 2025 15:23
github-actions bot and others added 2 commits August 26, 2025 11:22
…ompletion commands (#50472)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: baronfel <[email protected]>
Co-authored-by: SimonZhao888 <[email protected]>
@marcpopMSFT marcpopMSFT merged commit 6d31ccb into main Aug 26, 2025
27 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/10.0.1xx-to-main branch August 26, 2025 20:43
@premun
Copy link
Member

premun commented Aug 27, 2025

@marcpopMSFT we need to be careful so that these inter-branch merges don't also bring over the codeflow metadata (the <Source> tag in Version.Details.xml as it could block the codeflow.

We will reach out soonish with some questions/guidance on how to approach this because there's this main <-> main or release/10.0.1xx codeflow plus the interbranch merging going on.

@marcpopMSFT
Copy link
Member

@premun let us know once you have guidance. We typically try to accept the upper branch changes for anything under eng* assuming the existing branch has the right values but that's only if there are merge conflicts. If there aren't conflicts, it's harder to notice and so changes do flow up from eng.

CC @SimonZhao888

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.

8 participants