[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:

• @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/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/Common HEAD:merge/release/2.1-to-release/3.1

or if you are using SSH

git push git@github.com:dotnet-maestro-bot/Common 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/Common 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/Common 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 git@github.com:dotnet-maestro-bot/Common merge/release/2.1-to-release/3.1
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/Common 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.

[wtgodbe]

Don't merge this until we re-open for 3.1.6 in June

[wtgodbe]

I can't resolve this in the UI, nor can I push to dotnet-maestro-bot's fork (since it's of a repo named 'Common') - @mmitche @dougbu any ideas?

https://github.com/dotnet-maestro-bot/Common/tree/merge/release/2.1-to-release/3.1

[wtgodbe]

! [remote rejected] merge/release/3.1-to-release/3.1 -> merge/release/3.1-to-release/3.1 (permission denied)
error: failed to push some refs to 'https://github.com/dotnet-maestro-bot/Common.git'

[dougbu]

@wtgodbe not sure what is happening because the Common fork looks fine. I usually call in @mmitche at this point ☹️ (sorry Matt)

[mmitche]

That must have been what extensions used to be called? Should affect anything. Let me see...

[mmitche]

Alright I was somehow allowed to push. Let me go check the permissions on the fork.

[mmitche]

There are no allowed contributors on the fork. IIRC that means this defers to the permissions set on the PR. Which do allow pushes.

! [remote rejected] merge/release/3.1-to-release/3.1 -> merge/release/3.1-to-release/3.1 (permission denied)
error: failed to push some refs to 'https://github.com/dotnet-maestro-bot/Common.git'

I think you attempted to push the wrong branch name up to the fork. Should be merge/release/2.1-to-release/3.1

[wtgodbe]

Ah, I had a typo in my local branch. False alarm