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' => 'release/3.1' #1898

Merged

Conversation

@dotnet-maestro-bot
Copy link

dotnet-maestro-bot commented Sep 25, 2019

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

wtgodbe added 4 commits Sep 23, 2019
[release/3.0] Switch to embedded package icon
dougbu added 2 commits Sep 25, 2019
- use a 3.1.0-x SDK in 'release/3.1'
@dougbu
dougbu approved these changes Sep 25, 2019
@dougbu dougbu merged commit db1ff1c into aspnet:release/3.1 Sep 25, 2019
2 checks passed
2 checks passed
Blazor-ci Build #20190925.4 succeeded with issues
Details
license/cla All CLA requirements met.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.