Skip to content

Add new channels for SDK#14370

Merged
Forgind merged 1 commit into
dotnet:mainfrom
Forgind:add-8.0.3xx
Jan 16, 2024
Merged

Add new channels for SDK#14370
Forgind merged 1 commit into
dotnet:mainfrom
Forgind:add-8.0.3xx

Conversation

@Forgind

@Forgind Forgind commented Jan 13, 2024

Copy link
Copy Markdown
Contributor

To double check:

@Forgind Forgind merged commit 0d95a90 into dotnet:main Jan 16, 2024
@MilenaHristova

Copy link
Copy Markdown
Contributor

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/7624258939

@github-actions

Copy link
Copy Markdown
Contributor

@MilenaHristova an error occurred while backporting to release/8.0, please check the run log for details!

Error: @MilenaHristova is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=MilenaHristova

@premun

premun commented Jan 23, 2024

Copy link
Copy Markdown
Member

/backport to release/8.0

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/7624299519

@github-actions

Copy link
Copy Markdown
Contributor

@premun backporting to release/8.0 failed, the patch most likely resulted in conflicts:

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

Applying: Add new channels
Using index info to reconstruct a base tree...
M	src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add new channels
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions

Copy link
Copy Markdown
Contributor

@premun an error occurred while backporting to release/8.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

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