Skip to content

Make remote comparison ignore casing#6269

Merged
dkurepa merged 1 commit into
dotnet:mainfrom
dkurepa:dkurepa/GetRemoteFix
May 11, 2026
Merged

Make remote comparison ignore casing#6269
dkurepa merged 1 commit into
dotnet:mainfrom
dkurepa:dkurepa/GetRemoteFix

Conversation

@dkurepa
Copy link
Copy Markdown
Member

@dkurepa dkurepa commented May 8, 2026

Copilot AI review requested due to automatic review settings May 8, 2026 11:43
@dkurepa dkurepa force-pushed the dkurepa/GetRemoteFix branch from 35a8fd2 to f9124df Compare May 8, 2026 11:44
@dkurepa dkurepa changed the title Improve conflict resolution Make remote comparison ignore casing May 8, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.ResolveConflict to correctly resolve non-“both modified” conflict shapes (e.g., add/delete) using git 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.

@dkurepa dkurepa merged commit ac4249c into dotnet:main May 11, 2026
7 of 9 checks passed
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.

3 participants