Skip to content

Conversation

@mthalman
Copy link
Member

Backport of #2951

@mthalman mthalman requested review from a team as code owners October 21, 2025 18:05
@dotnet-policy-service dotnet-policy-service bot requested a review from a team October 21, 2025 18:06
@mthalman mthalman merged commit e150d2f into dotnet:release/10.0.2xx Oct 22, 2025
1 of 7 checks passed
@mthalman mthalman deleted the backport-vuln-versions branch October 22, 2025 12:34
@ViktorHofer
Copy link
Member

Do we need to forward port all required changes manually into Feature branches or will there a form of inter branch merge at some point? cc @mmitche

@mthalman
Copy link
Member Author

mthalman commented Oct 23, 2025

Do we need to forward port all required changes manually into Feature branches or will there a form of inter branch merge at some point? cc @mmitche

See dotnet/arcade-services#5378

That only applies to VMR-only source changes (i.e. the VMR orchestration). Changes to repo sources made in the VMR will flow back to the repo, then inter-branch merge to 2xx or whatever branch it has and then forward flow into the 2xx branch of the VMR. I made this backport as a special case as we're trying to hurry get the 2xx branch in a working state.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants