Workflow: Merge main to nightly
This should be done as soon as possible after a new .NET release (same day).
- Determine the release name. Run
pwsh eng/Get-ReleaseBranches.ps1to find the latest release branch. The most recently created branch corresponds to the current release. - Fetch changes from the dotnet/dotnet-docker
mainandnightlybranches. - Create a new branch based off of the
nightlybranch, calledmerge-main-to-nightly-$releaseName. - Merge main into your working branch with
git merge $remote/main. If there are conflicts, invoke theresolving-conflictsskill. - Stop and confirm the changes with the user. Ask them to review the changes and wait for confirmation to proceed.
- Submit the PR using the template.