菜单
Create a PR to merge main into the nightly branch after a .NET containers servicing release. Use when updating the nightly branch post-release or merging main to nightly.
默认使用会先检查来源的 Prompt；你也可以切换为直接命令，或下载本地副本。
决定是否安装前，请先阅读 SKILL.md，以及 SkillsMP 当前展示的配套文件。
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
直接命令不会经过审查 Prompt；运行前请先检查来源。
npx skills add https://github.com/dotnet/dotnet-docker --skill merge-main-to-nightly命令会保持在同一行。复制前请横向滚动并检查完整内容。
想先保存到本地？可下载 SkillsMP 当前能够提供的文件。
正在显示 SKILL.md
| name | merge-main-to-nightly |
| description | Create a PR to merge main into the nightly branch after a .NET containers servicing release. Use when updating the nightly branch post-release or merging main to nightly. |
| user-invocable | true |
| disable-model-invocation | true |
pwsh ../shared/Get-ReleaseBranches.ps1 to find the latest release branch.
nightly branch, called main-to-nightly-$releaseName.
git fetch upstream nightly && git checkout -b main-to-nightly-$releaseName upstream/nightlymain branch into your new branch, fixing any merge conflicts as necessary.
git fetch upstream main && git merge upstream/mainorigin and create a PR targeting the nightly branch.| Conflicting files | Resolution |
|---|---|
src/* | Regenerate Dockerfiles. |
READMEs | Regenerate READMEs. |
manifest.json | Take changes from nightly, ensure preview/nightly tags remain, then regenerate Dockerfiles and READMEs. |
manifest.versions.json | Keep nightly's versions (which are typically newer/preview). Incorporate any structural changes from main. |
| Other files | Stop and consult the user. |
Analyze and backport changes from nightly to the release branch in dotnet/dotnet-docker.
Create a public PR to the dotnet-docker release branch with new .NET versions, and a follow-up PR from the release branch into main. Use when preparing the public release PR for a .NET containers servicing release.
基于 SOC 职业分类
