Skip to content

Conversation

@akoeplinger
Copy link
Member

@akoeplinger akoeplinger commented Oct 14, 2025

The api.nuget.org source will clash with the CFSClean network isolation policy and the same data is provided by AzDO now.

The api.nuget.org source will clash with the CFSClean network isolation policy
@akoeplinger akoeplinger enabled auto-merge (squash) October 14, 2025 15:30
@akoeplinger akoeplinger merged commit 5c32309 into main Oct 14, 2025
9 of 10 checks passed
@akoeplinger akoeplinger deleted the akoeplinger-patch-2 branch October 14, 2025 16:36
@mmitche
Copy link
Member

mmitche commented Nov 26, 2025

/backport to release/10.0

@mmitche
Copy link
Member

mmitche commented Nov 26, 2025

/backport to release/9.0

@github-actions
Copy link
Contributor

Started backporting to release/10.0 (link to workflow run)

@github-actions
Copy link
Contributor

Started backporting to release/9.0 (link to workflow run)

@github-actions
Copy link
Contributor

@mmitche backporting to release/9.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Remove audit sources from NuGet.config
Using index info to reconstruct a base tree...
M	NuGet.config
Falling back to patching base and 3-way merge...
Auto-merging NuGet.config
CONFLICT (content): Merge conflict in NuGet.config
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Remove audit sources from NuGet.config
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

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.

4 participants