Skip to content

Fix duplicate parameter in github merge flow#52344

Merged
jjonescz merged 2 commits intodotnet:mainfrom
jjonescz:merge-flow-config
Jan 8, 2026
Merged

Fix duplicate parameter in github merge flow#52344
jjonescz merged 2 commits intodotnet:mainfrom
jjonescz:merge-flow-config

Conversation

@jjonescz
Copy link
Member

@jjonescz jjonescz commented Jan 7, 2026

The branch merge workflow seems to be completely broken in the sdk repo these days with errors like:

Run D:\a\sdk\sdk\arcade-repository\.github\workflows\scripts\inter-branch-merge.ps1 -RepoName sdk -RepoOwner dotnet -MergeFromBranch $env:GITHUB_REF_NAME -MergeToBranch main -ResetToTargetPaths "" -QuietComments -ResetToTargetPaths global.json;NuGet.config;eng/Version.Details.xml;eng/Version.Details.props;eng/common/*
inter-branch-merge.ps1: D:\a\_temp\99bd6d72-4688-4ba6-a447-0fd0ca3d76d0.ps1:2
Line |
   2 |  … ain -ResetToTargetPaths "" -QuietComments -ResetToTargetPaths global. …
     |                                              ~~~~~~~~~~~~~~~~~~~
     | Cannot bind parameter because parameter 'ResetToTargetPaths' is specified more than once. To provide multiple
     | values to parameters that can accept multiple values, use the array syntax. For example, "-parameter
     | value1,value2,value3".
Error: Process completed with exit code 1.

I believe this PR should fix that.

@jjonescz jjonescz requested review from a team and Copilot January 7, 2026 13:32
Copilot AI reviewed Jan 7, 2026
View reviewed changes
Copy link
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 fixes a critical issue in the inter-branch merge workflow that was causing automation failures due to duplicate PowerShell parameters. The workflow script was receiving -ResetToTargetPaths specified twice - once as an empty default value and again with actual file paths from the ExtraSwitches configuration.

Key Changes:

  • Extracted ResetToTargetPaths parameter from ExtraSwitches into a dedicated property across all merge flow configurations
  • Standardized configuration structure to prevent PowerShell parameter binding errors

@jjonescz
Copy link
Member Author

jjonescz commented Jan 7, 2026

/ba-g CI skipped

@jjonescz
Copy link
Member Author

jjonescz commented Jan 8, 2026

/ba-g CI skipped

@jjonescz jjonescz merged commit 38187ce into dotnet:main Jan 8, 2026
6 of 7 checks passed
@jjonescz jjonescz deleted the merge-flow-config branch January 8, 2026 10:31
@jjonescz jjonescz mentioned this pull request Jan 8, 2026
Closed
@dotnet-maestro dotnet-maestro bot mentioned this pull request Jan 9, 2026
Closed
@dotnet-maestro dotnet-maestro bot mentioned this pull request Jan 16, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@MiYanni MiYanni MiYanni approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jjonescz @MiYanni