[main] Servicing docs improvements #85855
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Co-authored-by: Carlos Sánchez López <[email protected]>
|
Tagging subscribers to this area: @dotnet/area-meta Issue DetailsBackport of #85731 to main Customer ImpactTestingRiskIMPORTANT: If this backport is for a servicing release, please verify that:
|
|
/backport to release/6.0-staging |
|
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4920657763 |
|
@carlossanlop backporting to release/6.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Servicing docs improvements
Using index info to reconstruct a base tree...
M .github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
M docs/project/library-servicing.md
Falling back to patching base and 3-way merge...
Auto-merging docs/project/library-servicing.md
CONFLICT (content): Merge conflict in docs/project/library-servicing.md
Auto-merging .github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
CONFLICT (content): Merge conflict in .github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Servicing docs improvements
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 128Please backport manually! |
|
@carlossanlop an error occurred while backporting to release/6.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
ghost
locked as resolved and limited conversation to collaborators
Backport of #85731 to main
/cc @hoyosjs @carlossanlop
Customer Impact
Testing
Risk
IMPORTANT: If this backport is for a servicing release, please verify that:
The PR target branch is
release/X.0-staging, notrelease/X.0.If the change touches code that ships in a NuGet package, you have added the necessary package authoring and gotten it explicitly reviewed.