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/2.1' => 'release/2.2' #8521

Merged
merged 2 commits into from Mar 14, 2019

Conversation

Projects
None yet
2 participants
@dotnet-maestro-bot
Copy link
Contributor

dotnet-maestro-bot commented Mar 14, 2019

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

This PR merges commits made on release/2.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/2.1
git pull --ff-only
git checkout release/2.2
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/2.2
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/AspNetCore HEAD:merge/release/2.1-to-release/2.2

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/2.2'. 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/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
or if you are using SSH
git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull git@github.com:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/AspNetCore merge/release/2.1-to-release/2.2

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.

dougbu added some commits Mar 14, 2019

Unpin the System.Net.Http.WinHttpHandler package version
- CoreFx shipping a new version
@dougbu

dougbu approved these changes Mar 14, 2019

@dougbu dougbu merged commit 6cf554e into aspnet:release/2.2 Mar 14, 2019

1 check passed

license/cla All CLA requirements met.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.