-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Servicing docs improvements #85731
Servicing docs improvements #85731
Conversation
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsAdding more details to our servicing documentation, particularly around the check-servicing-labels CI leg. Starting with the 7.0-staging branch to confirm the CI workflow changes work, then will backport to 7.0, 6.0-staging, 6.0, and finally to main. Also want to confirm if:
|
.github/PULL_REQUEST_TEMPLATE/servicing_pull_request_template.md
Outdated
Show resolved
Hide resolved
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
/backport to main |
Started backporting to main: https://github.com/dotnet/runtime/actions/runs/4898788375 |
/backport to release/6.0-staging |
Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4898789433 |
@hoyosjs 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
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 128 Please backport manually! |
@hoyosjs 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. |
@hoyosjs thanks for trying, but backport can't be easily done with these changes. I'll submit the rest of the PRs manually. |
Adding more details to our servicing documentation, particularly around the check-servicing-labels CI leg.
Starting with the 7.0-staging branch to confirm the CI workflow changes work, then will backport to 7.0, 6.0-staging, 6.0, and finally to main.
Also want to confirm if: