Make remote comparison ignore casing#6269
Merged
Merged
Conversation
35a8fd2 to
f9124df
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves reliability of PCS/Darc codeflow operations by making conflict resolution logic more robust (including added/deleted-file conflicts) and by handling Git remote URL casing mismatches that can block subscriptions (Issue #6268).
Changes:
- Make target-repo remote lookup case-insensitive when updating remotes for manual-conflict-resolution PRs.
- Refactor crossing-flow patch creation logic into a shared helper and add a dedicated path for reapplying crossing-flow changes to non-conflicted files.
- Enhance
LocalGitClient.ResolveConflictto correctly resolve non-“both modified” conflict shapes (e.g., add/delete) usinggit status --porcelain.
Reviewed changes
Copilot reviewed 1 out of 1 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestUpdaters/CodeFlowPullRequestUpdater.cs | Fixes remote matching when subscription URL casing differs from git remote -v. |
| src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/ForwardFlowConflictResolver.cs | Adds logic to auto-resolve conflicts outside the flowed repo path (but see blocking comment). |
| src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CodeFlowConflictResolver.cs | Extracts crossing-flow patch creation and adds reapply logic for partial-revert repair scenarios. |
| src/Microsoft.DotNet.Darc/DarcLib/LocalGitClient.cs | Improves conflict resolution to handle add/delete variants and avoid invalid checkout --ours/--theirs calls. |
premun
approved these changes
May 11, 2026
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.
#6268