dotnet
[automated] Merge branch 'release/3.1' => 'main'
I detected changes in the release/3.1 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on release/3.1 by the following committers:
- wtgodbe
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
git fetch
git checkout release/3.1
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/3.1
# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/AspNetCore-Tooling HEAD:merge/release/3.1-to-main
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/AspNetCore-Tooling HEAD:merge/release/3.1-to-main
After PR checks are complete push the branch
git push
Instructions for resolving conflicts
:warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/3.1-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
git checkout -b merge/release/3.1-to-main main
git pull https://github.com/dotnet-maestro-bot/AspNetCore-Tooling merge/release/3.1-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore-Tooling HEAD:merge/release/3.1-to-main
or if you are using SSH
git checkout -b merge/release/3.1-to-main main
git pull [email protected]:dotnet-maestro-bot/AspNetCore-Tooling merge/release/3.1-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore-Tooling HEAD:merge/release/3.1-to-main
Contact .NET Core Engineering if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.
Hello @msftbot[bot]!
Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.
p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.
I suspect we don't. I wonder if this was left open to collect the auto-merge's from release/3.1 so we don't have to deal with them. @dougbu any idea if there is anything in release/3.1 that needs to carry forward?
I'm assuming we can ignore that branch entirely come December, and this PR along with it.
- We probably need to deal w/ extended support for release/3.1 and I don't know how long that'll last
- It appears Arcade hasn't been updating in main and you may be behind on some infrastructure changes
- Getting this in will at least ensure product fixes get merged forward i.e. going through the conflicts is useful
We do get weekly arcade updates in main: https://github.com/dotnet/razor-tooling/pull/7020, https://github.com/dotnet/razor-tooling/pull/6993, https://github.com/dotnet/razor-tooling/pull/6972
I'll assign this to myself to go through the conflict and see what I can see
I had a look through all of the changes and conflicts, and the only product code changes that seem potentially important are some parameter handling in a .NET tool which no longer exists, and mitigation for duplicate directives in the C# parser, which is already in place in main (though the merge doesn't know it, because everything has moved around).