Skip to content

[automated] Merge branch 'release/3.1' => 'master'#3428

Closed
dotnet-maestro-bot wants to merge 3 commits intodotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1-to-master
Closed

[automated] Merge branch 'release/3.1' => 'master'#3428
dotnet-maestro-bot wants to merge 3 commits intodotnet:masterfrom
dotnet-maestro-bot:merge/release/3.1-to-master

Conversation

@dotnet-maestro-bot
Copy link
Contributor

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

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

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.

merge button instructions

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 master
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/Common HEAD:merge/release/3.1-to-master
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master

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/3.1-to-master'. 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-master master
git pull https://github.com/dotnet-maestro-bot/Common merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master
or if you are using SSH
git checkout -b merge/release/3.1-to-master master
git pull [email protected]:dotnet-maestro-bot/Common merge/release/3.1-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/Common HEAD:merge/release/3.1-to-master

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.

dotnet-maestro bot and others added 3 commits August 18, 2020 21:36
* Update dependencies from https://github.com/dotnet/core-setup build 20200818.3

Microsoft.NETCore.App.Internal , Microsoft.NETCore.App.Runtime.win-x64
 From Version 3.1.8-servicing.20415.1 -> To Version 3.1.8-servicing.20418.3

Dependency coherency updates

System.IO.Pipelines,System.Net.Http.WinHttpHandler,System.Net.WebSockets.WebSocketProtocol,System.Threading.Channels
 From Version 4.7.2 -> To Version 4.7.2 (parent: Microsoft.NETCore.App.Runtime.win-x64

* !fixup! Add 3.1 feeds
  - not sure why things are working without these but let's future-proof ourselves
* !fixup! Remove 3.0 feeds

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Doug Bunting <[email protected]>
…0200819.1 (dotnet#3427)

[release/3.1] Update dependencies from dotnet/core-setup
- Updates:
  - Microsoft.NETCore.App.Internal: from 3.1.8-servicing.20418.3 to 3.1.8-servicing.20419.1
  - Microsoft.NETCore.App.Runtime.win-x64: from 3.1.8 to 3.1.8
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost ghost added the auto-merge label Aug 19, 2020
@ghost
Copy link

ghost commented Aug 19, 2020

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.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 60 minutes. No worries though, I will be back when the time is right! 😉

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.

@BrennanConroy
Copy link
Member

For some reason the bot made two very different 3.1->master PRs, closing both for it to hopefully make 1 correct one

@ghost ghost locked as resolved and limited conversation to collaborators May 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants