Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/3.0' => 'master' #2239

Merged
merged 2 commits into from
Aug 27, 2019

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/3.0 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.0 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.0
git pull --ff-only
git checkout master
git pull --ff-only
git merge --no-ff release/3.0

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

* Update dependencies from https://github.com/dotnet/core-setup build 20190826.11

- Microsoft.NETCore.App.Ref - 3.0.0-rc1-19426-11
- NETStandard.Library.Ref - 2.1.0-rc1-19426-11
- Microsoft.NETCore.App.Runtime.win-x64 - 3.0.0-rc1-19426-11

* Update dependencies from https://github.com/dotnet/roslyn build 20190826.2

- Microsoft.Net.Compilers.Toolset - 3.3.1-beta3-19426-02
@wtgodbe wtgodbe merged commit 12a28e4 into dotnet:master Aug 27, 2019
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 12, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from dotnet/extensions@12a28e4
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Feb 15, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from dotnet/extensions@12a28e4
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Feb 28, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'


Commit migrated from dotnet/extensions@12a28e4
maryamariyan pushed a commit to maryamariyan/runtime that referenced this pull request Mar 2, 2020
…ge/release/3.0-to-master

[automated] Merge branch 'release/3.0' => 'master'


Commit migrated from dotnet/extensions@12a28e4
@ghost ghost locked as resolved and limited conversation to collaborators May 27, 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