[automated] Merge branch 'release/2.1' => 'release/3.1'

[dotnet-maestro-bot]

I detected changes in the release/2.1 branch which have not been merged yet to release/3.1. I'm a robot and am configured to help you automatically keep release/3.1 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

• @dougbu

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/2.1
git pull --ff-only
git checkout release/3.1
git pull --ff-only
git merge --no-ff release/2.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 HEAD:merge/release/2.1-to-release/3.1

or if you are using SSH

git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/3.1

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ 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/2.1-to-release/3.1'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/3.1 release/3.1
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/3.1

or if you are using SSH

git checkout -b merge/release/2.1-to-release/3.1 release/3.1
git pull [email protected]:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/3.1

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.

[ghost]

Auto-approving branch merge.

[dougbu]

@Pilchie this is weird. Why is the bot doing anything other than a no-op merge of the final merge commit from 2.1? My merge PR (#20146) should have brought the 2.1 change in already.

Put another way, is https://github.com/dotnet/aspnetcore-internal/blob/master/docs/engineering/servicing-and-preview-fixes.md#distinct-changes-needed-in-one-or-more-branch fundamentally broken by the need to merge merge commits?

[dougbu]

Resolved the conflicts locally and git diff origin/release/3.1 now shows no changes. Nonetheless this PR remains busted at least in what GitHub shows in the Files tab. Suspect nothing would happen if I admin merged this right away. But (FYI @wtgodbe) I'm going to let this ride for a bit and see if the UI rights itself in a bit. It's time for a late lunch anyway…

But, we still need to understand why the merge bot didn't open an initially-clean (no-op) merge here. I'm not sure where to look and would appreciate any suggestions.

[Pilchie]

I don't see conflicts at the moment. Note that GH shows different sets of conflicts depending on what commit strategy is currently selected (rebase/merge/squash).

[dougbu]

I don't see conflicts at the moment. Note that GH shows different sets of conflicts depending on what commit strategy is currently selected (rebase/merge/squash).

I resolved the supposed conflicts locally then updated the bot's branch. What concerns me is the Files changed 2 tab shown in this UI as well as the even-more-confusing mix of real and imaginary changes shown in #20150. This isn't going to save the ops-on-call person any time if every infrastructure merge shows up in automated merge PRs this way.