Backflow 10.0.2xx VMR#13121
Merged
Merged
Conversation
ViktorHofer
approved these changes
Jan 26, 2026
ViktorHofer
enabled auto-merge (squash)
January 26, 2026 16:38
Member
Author
|
oh I didn't save the file, thanks @ViktorHofer |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR performs a VMR (Virtual Monolithic Repository) backflow from a different branch into the 10.0.2xx branch. The operation required the --unsafe option in darc, indicating manual intervention was needed during the merge process. Unfortunately, the merge was not completed successfully, leaving unresolved conflicts.
Changes:
- Updated VMR source reference with new SHA (181f8798913e9c234e19756db58f38a8cac176ea) and BarId (298730)
- Added new C# analyzer rules IDE0370 and IDE0380 to .editorconfig
- Attempted version prefix update with unresolved merge conflict between 18.3.1 and 18.3.0
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| eng/Version.Details.xml | Updates VMR source SHA and BarId for the backflow operation |
| eng/Versions.props | Contains unresolved merge conflict markers for VersionPrefix property |
| .editorconfig | Adds new diagnostic rules IDE0370 and IDE0380, but creates duplicate IDE0370 definition |
Closed
4 tasks
ViktorHofer
disabled auto-merge
January 27, 2026 09:29
ViktorHofer
enabled auto-merge
January 27, 2026 09:29
Member
Author
|
@rainersigwald could we please get an approval here? this will unblock the backflows to this branch |
MichalPavlik
approved these changes
Jan 28, 2026
This was referenced May 19, 2026
This was referenced Jul 15, 2026
Merged
This was referenced Jul 15, 2026
Closed
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This branch changed which VMR branch was backflowing into it, requiring manual intervention.
This was done using the
--unsafeoption in darc so please review carefully